MAINTAINERS - Remove HP Fibre Channel HBA no longer in tree

[sfrench/cifs-2.6.git] / include / linux / parport_pc.h

diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h
index c6f7624708796434d74b0480cdb0c67646a86418..cc1767f5cca86026d4ab98a782037d285666a37f 100644 (file)
--- a/include/linux/parport_pc.h
+++ b/include/linux/parport_pc.h
@@ -38,7 +38,6 @@ struct parport_pc_private {
        /* buffer suitable for DMA, if DMA enabled */
        char *dma_buf;
        dma_addr_t dma_handle;
-       struct pci_dev *dev;
        struct list_head list;
        struct parport *port;
 };
@@ -79,13 +78,13 @@ static __inline__ unsigned char parport_pc_read_data(struct parport *p)
 }
 
 #ifdef DEBUG_PARPORT
-extern __inline__ void dump_parport_state (char *str, struct parport *p)
+static inline void dump_parport_state (char *str, struct parport *p)
 {
        /* here's hoping that reading these ports won't side-effect anything underneath */
        unsigned char ecr = inb (ECONTROL (p));
        unsigned char dcr = inb (CONTROL (p));
        unsigned char dsr = inb (STATUS (p));
-       static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
+       static const char *const ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"};
        const struct parport_pc_private *priv = p->physport->private_data;
        int i;
 
@@ -229,10 +228,11 @@ extern void parport_pc_release_resources(struct parport *p);
 extern int parport_pc_claim_resources(struct parport *p);
 
 /* PCMCIA code will want to get us to look at a port.  Provide a mechanism. */
-extern struct parport *parport_pc_probe_port (unsigned long base,
-                                             unsigned long base_hi,
-                                             int irq, int dma,
-                                             struct pci_dev *dev);
-extern void parport_pc_unregister_port (struct parport *p);
+extern struct parport *parport_pc_probe_port(unsigned long base,
+                                            unsigned long base_hi,
+                                            int irq, int dma,
+                                            struct device *dev,
+                                            int irqflags);
+extern void parport_pc_unregister_port(struct parport *p);
 
 #endif