parport: Standardize use of printmode
[linux-2.6-microblaze.git] / drivers / parport / parport_pc.c
index 1f17a39..77e37e3 100644 (file)
 
 #undef DEBUG
 
-#ifdef DEBUG
-#define DPRINTK  printk
-#else
-#define DPRINTK(stuff...)
-#endif
-
-
 #define NR_SUPERIOS 3
 static struct superio_struct { /* For Super-IO chips autodetection */
        int io;
@@ -118,8 +111,8 @@ static void frob_econtrol(struct parport *pb, unsigned char m,
        if (m != 0xff)
                ectr = inb(ECONTROL(pb));
 
-       DPRINTK(KERN_DEBUG "frob_econtrol(%02x,%02x): %02x -> %02x\n",
-               m, v, ectr, (ectr & ~m) ^ v);
+       pr_debug("frob_econtrol(%02x,%02x): %02x -> %02x\n",
+                m, v, ectr, (ectr & ~m) ^ v);
 
        outb((ectr & ~m) ^ v, ECONTROL(pb));
 }
@@ -142,7 +135,7 @@ static int change_mode(struct parport *p, int m)
        unsigned char oecr;
        int mode;
 
-       DPRINTK(KERN_INFO "parport change_mode ECP-ISA to mode 0x%02x\n", m);
+       pr_debug("parport change_mode ECP-ISA to mode 0x%02x\n", m);
 
        if (!priv->ecr) {
                printk(KERN_DEBUG "change_mode: but there's no ECR!\n");
@@ -298,8 +291,8 @@ static size_t parport_pc_epp_read_data(struct parport *port, void *buf,
                        status = inb(STATUS(port));
                        if (status & 0x01) {
                                /* EPP timeout should never occur... */
-                               printk(KERN_DEBUG
-"%s: EPP timeout occurred while talking to w91284pic (should not have done)\n", port->name);
+                               printk(KERN_DEBUG "%s: EPP timeout occurred while talking to w91284pic (should not have done)\n",
+                                      port->name);
                                clear_epp_timeout(port);
                        }
                }
@@ -727,7 +720,7 @@ static size_t parport_pc_compat_write_block_pio(struct parport *port,
        r = change_mode(port, ECR_PPF); /* Parallel port FIFO */
        if (r)
                printk(KERN_DEBUG "%s: Warning change_mode ECR_PPF failed\n",
-                                                               port->name);
+                      port->name);
 
        port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
 
@@ -770,9 +763,8 @@ static size_t parport_pc_compat_write_block_pio(struct parport *port,
                                     PARPORT_STATUS_BUSY,
                                     PARPORT_STATUS_BUSY);
        if (r)
-               printk(KERN_DEBUG
-                       "%s: BUSY timeout (%d) in compat_write_block_pio\n",
-                       port->name, r);
+               printk(KERN_DEBUG "%s: BUSY timeout (%d) in compat_write_block_pio\n",
+                      port->name, r);
 
        port->physport->ieee1284.phase = IEEE1284_PH_FWD_IDLE;
 
@@ -810,8 +802,8 @@ static size_t parport_pc_ecp_write_block_pio(struct parport *port,
                                             PARPORT_STATUS_PAPEROUT,
                                             PARPORT_STATUS_PAPEROUT);
                if (r) {
-                       printk(KERN_DEBUG "%s: PError timeout (%d) "
-                               "in ecp_write_block_pio\n", port->name, r);
+                       printk(KERN_DEBUG "%s: PError timeout (%d) in ecp_write_block_pio\n",
+                              port->name, r);
                }
        }
 
@@ -824,7 +816,7 @@ static size_t parport_pc_ecp_write_block_pio(struct parport *port,
        r = change_mode(port, ECR_ECP); /* ECP FIFO */
        if (r)
                printk(KERN_DEBUG "%s: Warning change_mode ECR_ECP failed\n",
-                                                               port->name);
+                      port->name);
        port->physport->ieee1284.phase = IEEE1284_PH_FWD_DATA;
 
        /* Write the data to the FIFO. */
@@ -867,8 +859,8 @@ static size_t parport_pc_ecp_write_block_pio(struct parport *port,
                parport_frob_control(port, PARPORT_CONTROL_INIT, 0);
                r = parport_wait_peripheral(port, PARPORT_STATUS_PAPEROUT, 0);
                if (r)
-                       printk(KERN_DEBUG "%s: PE,1 timeout (%d) "
-                               "in ecp_write_block_pio\n", port->name, r);
+                       printk(KERN_DEBUG "%s: PE,1 timeout (%d) in ecp_write_block_pio\n",
+                              port->name, r);
 
                parport_frob_control(port,
                                      PARPORT_CONTROL_INIT,
@@ -877,17 +869,16 @@ static size_t parport_pc_ecp_write_block_pio(struct parport *port,
                                             PARPORT_STATUS_PAPEROUT,
                                             PARPORT_STATUS_PAPEROUT);
                if (r)
-                       printk(KERN_DEBUG "%s: PE,2 timeout (%d) "
-                               "in ecp_write_block_pio\n", port->name, r);
+                       printk(KERN_DEBUG "%s: PE,2 timeout (%d) in ecp_write_block_pio\n",
+                              port->name, r);
        }
 
        r = parport_wait_peripheral(port,
                                     PARPORT_STATUS_BUSY,
                                     PARPORT_STATUS_BUSY);
        if (r)
-               printk(KERN_DEBUG
-                       "%s: BUSY timeout (%d) in ecp_write_block_pio\n",
-                       port->name, r);
+               printk(KERN_DEBUG "%s: BUSY timeout (%d) in ecp_write_block_pio\n",
+                      port->name, r);
 
        port->physport->ieee1284.phase = IEEE1284_PH_FWD_IDLE;
 
@@ -982,28 +973,24 @@ static void show_parconfig_smsc37c669(int io, int key)
        outb(0xaa, io);
 
        if (verbose_probing) {
-               printk(KERN_INFO
-                       "SMSC 37c669 LPT Config: cr_1=0x%02x, 4=0x%02x, "
-                       "A=0x%2x, 23=0x%02x, 26=0x%02x, 27=0x%02x\n",
+               pr_info("SMSC 37c669 LPT Config: cr_1=0x%02x, 4=0x%02x, A=0x%2x, 23=0x%02x, 26=0x%02x, 27=0x%02x\n",
                        cr1, cr4, cra, cr23, cr26, cr27);
 
                /* The documentation calls DMA and IRQ-Lines by letters, so
                   the board maker can/will wire them
                   appropriately/randomly...  G=reserved H=IDE-irq, */
-               printk(KERN_INFO
-       "SMSC LPT Config: io=0x%04x, irq=%c, dma=%c, fifo threshold=%d\n",
-                               cr23 * 4,
-                               (cr27 & 0x0f) ? 'A' - 1 + (cr27 & 0x0f) : '-',
-                               (cr26 & 0x0f) ? 'A' - 1 + (cr26 & 0x0f) : '-',
-                               cra & 0x0f);
-               printk(KERN_INFO "SMSC LPT Config: enabled=%s power=%s\n",
-                      (cr23 * 4 >= 0x100) ? "yes" : "no",
-                      (cr1 & 4) ? "yes" : "no");
-               printk(KERN_INFO
-                       "SMSC LPT Config: Port mode=%s, EPP version =%s\n",
-                               (cr1 & 0x08) ? "Standard mode only (SPP)"
-                                             : modes[cr4 & 0x03],
-                               (cr4 & 0x40) ? "1.7" : "1.9");
+               pr_info("SMSC LPT Config: io=0x%04x, irq=%c, dma=%c, fifo threshold=%d\n",
+                       cr23 * 4,
+                       (cr27 & 0x0f) ? 'A' - 1 + (cr27 & 0x0f) : '-',
+                       (cr26 & 0x0f) ? 'A' - 1 + (cr26 & 0x0f) : '-',
+                       cra & 0x0f);
+               pr_info("SMSC LPT Config: enabled=%s power=%s\n",
+                       (cr23 * 4 >= 0x100) ? "yes" : "no",
+                       (cr1 & 4) ? "yes" : "no");
+               pr_info("SMSC LPT Config: Port mode=%s, EPP version =%s\n",
+                       (cr1 & 0x08) ? "Standard mode only (SPP)"
+                       : modes[cr4 & 0x03],
+                       (cr4 & 0x40) ? "1.7" : "1.9");
        }
 
        /* Heuristics !  BIOS setup for this mainboard device limits
@@ -1013,7 +1000,7 @@ static void show_parconfig_smsc37c669(int io, int key)
        if (cr23 * 4 >= 0x100) { /* if active */
                s = find_free_superio();
                if (s == NULL)
-                       printk(KERN_INFO "Super-IO: too many chips!\n");
+                       pr_info("Super-IO: too many chips!\n");
                else {
                        int d;
                        switch (cr23 * 4) {
@@ -1078,26 +1065,24 @@ static void show_parconfig_winbond(int io, int key)
        outb(0xaa, io);
 
        if (verbose_probing) {
-               printk(KERN_INFO
-    "Winbond LPT Config: cr_30=%02x 60,61=%02x%02x 70=%02x 74=%02x, f0=%02x\n",
-                                       cr30, cr60, cr61, cr70, cr74, crf0);
-               printk(KERN_INFO "Winbond LPT Config: active=%s, io=0x%02x%02x irq=%d, ",
-                      (cr30 & 0x01) ? "yes" : "no", cr60, cr61, cr70 & 0x0f);
+               pr_info("Winbond LPT Config: cr_30=%02x 60,61=%02x%02x 70=%02x 74=%02x, f0=%02x\n",
+                       cr30, cr60, cr61, cr70, cr74, crf0);
+               pr_info("Winbond LPT Config: active=%s, io=0x%02x%02x irq=%d, ",
+                       (cr30 & 0x01) ? "yes" : "no", cr60, cr61, cr70 & 0x0f);
                if ((cr74 & 0x07) > 3)
                        pr_cont("dma=none\n");
                else
                        pr_cont("dma=%d\n", cr74 & 0x07);
-               printk(KERN_INFO
-                   "Winbond LPT Config: irqtype=%s, ECP fifo threshold=%d\n",
-                                       irqtypes[crf0>>7], (crf0>>3)&0x0f);
-               printk(KERN_INFO "Winbond LPT Config: Port mode=%s\n",
-                                       modes[crf0 & 0x07]);
+               pr_info("Winbond LPT Config: irqtype=%s, ECP fifo threshold=%d\n",
+                       irqtypes[crf0 >> 7], (crf0 >> 3) & 0x0f);
+               pr_info("Winbond LPT Config: Port mode=%s\n",
+                       modes[crf0 & 0x07]);
        }
 
        if (cr30 & 0x01) { /* the settings can be interrogated later ... */
                s = find_free_superio();
                if (s == NULL)
-                       printk(KERN_INFO "Super-IO: too many chips!\n");
+                       pr_info("Super-IO: too many chips!\n");
                else {
                        s->io = (cr60 << 8) | cr61;
                        s->irq = cr70 & 0x0f;
@@ -1151,9 +1136,8 @@ static void decode_winbond(int efer, int key, int devid, int devrev, int oldid)
                progif = 0;
 
        if (verbose_probing)
-               printk(KERN_INFO "Winbond chip at EFER=0x%x key=0x%02x "
-                      "devid=%02x devrev=%02x oldid=%02x type=%s\n",
-                      efer, key, devid, devrev, oldid, type);
+               pr_info("Winbond chip at EFER=0x%x key=0x%02x devid=%02x devrev=%02x oldid=%02x type=%s\n",
+                       efer, key, devid, devrev, oldid, type);
 
        if (progif == 2)
                show_parconfig_winbond(efer, key);
@@ -1184,9 +1168,8 @@ static void decode_smsc(int efer, int key, int devid, int devrev)
                type = "37c666GT";
 
        if (verbose_probing)
-               printk(KERN_INFO "SMSC chip at EFER=0x%x "
-                      "key=0x%02x devid=%02x devrev=%02x type=%s\n",
-                      efer, key, devid, devrev, type);
+               pr_info("SMSC chip at EFER=0x%x key=0x%02x devid=%02x devrev=%02x type=%s\n",
+                       efer, key, devid, devrev, type);
 
        if (func)
                func(efer, key);
@@ -1358,7 +1341,7 @@ static void detect_and_report_it87(void)
        dev |= inb(0x2f);
        if (dev == 0x8712 || dev == 0x8705 || dev == 0x8715 ||
            dev == 0x8716 || dev == 0x8718 || dev == 0x8726) {
-               printk(KERN_INFO "IT%04X SuperIO detected.\n", dev);
+               pr_info("IT%04X SuperIO detected\n", dev);
                outb(0x07, 0x2E);       /* Parallel Port */
                outb(0x03, 0x2F);
                outb(0xF0, 0x2E);       /* BOOT 0x80 off */
@@ -1445,8 +1428,8 @@ static int parport_SPP_supported(struct parport *pb)
        if (user_specified)
                /* That didn't work, but the user thinks there's a
                 * port here. */
-               printk(KERN_INFO "parport 0x%lx (WARNING): CTR: "
-                       "wrote 0x%02x, read 0x%02x\n", pb->base, w, r);
+               pr_info("parport 0x%lx (WARNING): CTR: wrote 0x%02x, read 0x%02x\n",
+                       pb->base, w, r);
 
        /* Try the data register.  The data lines aren't tri-stated at
         * this stage, so we expect back what we wrote. */
@@ -1464,10 +1447,9 @@ static int parport_SPP_supported(struct parport *pb)
        if (user_specified) {
                /* Didn't work, but the user is convinced this is the
                 * place. */
-               printk(KERN_INFO "parport 0x%lx (WARNING): DATA: "
-                       "wrote 0x%02x, read 0x%02x\n", pb->base, w, r);
-               printk(KERN_INFO "parport 0x%lx: You gave this address, "
-                       "but there is probably no parallel port there!\n",
+               pr_info("parport 0x%lx (WARNING): DATA: wrote 0x%02x, read 0x%02x\n",
+                       pb->base, w, r);
+               pr_info("parport 0x%lx: You gave this address, but there is probably no parallel port there!\n",
                        pb->base);
        }
 
@@ -1620,7 +1602,7 @@ static int parport_ECP_supported(struct parport *pb)
        if (i <= priv->fifo_depth) {
                if (verbose_probing)
                        printk(KERN_DEBUG "0x%lx: writeIntrThreshold is %d\n",
-                               pb->base, i);
+                              pb->base, i);
        } else
                /* Number of bytes we know we can write if we get an
                   interrupt. */
@@ -1642,7 +1624,7 @@ static int parport_ECP_supported(struct parport *pb)
 
        if (i <= priv->fifo_depth) {
                if (verbose_probing)
-                       printk(KERN_INFO "0x%lx: readIntrThreshold is %d\n",
+                       pr_info("0x%lx: readIntrThreshold is %d\n",
                                pb->base, i);
        } else
                /* Number of bytes we can read if we get an interrupt. */
@@ -1657,17 +1639,14 @@ static int parport_ECP_supported(struct parport *pb)
        switch (pword) {
        case 0:
                pword = 2;
-               printk(KERN_WARNING "0x%lx: Unsupported pword size!\n",
-                       pb->base);
+               pr_warn("0x%lx: Unsupported pword size!\n", pb->base);
                break;
        case 2:
                pword = 4;
-               printk(KERN_WARNING "0x%lx: Unsupported pword size!\n",
-                       pb->base);
+               pr_warn("0x%lx: Unsupported pword size!\n", pb->base);
                break;
        default:
-               printk(KERN_WARNING "0x%lx: Unknown implementation ID\n",
-                       pb->base);
+               pr_warn("0x%lx: Unknown implementation ID\n", pb->base);
                /* Fall through - Assume 1 */
        case 1:
                pword = 1;
@@ -1676,14 +1655,14 @@ static int parport_ECP_supported(struct parport *pb)
 
        if (verbose_probing) {
                printk(KERN_DEBUG "0x%lx: PWord is %d bits\n",
-                       pb->base, 8 * pword);
+                      pb->base, 8 * pword);
 
-               printk(KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n", pb->base,
-                       config & 0x80 ? "Level" : "Pulses");
+               printk(KERN_DEBUG "0x%lx: Interrupts are ISA-%s\n",
+                      pb->base, config & 0x80 ? "Level" : "Pulses");
 
                configb = inb(CONFIGB(pb));
                printk(KERN_DEBUG "0x%lx: ECP port cfgA=0x%02x cfgB=0x%02x\n",
-                       pb->base, config, configb);
+                      pb->base, config, configb);
                printk(KERN_DEBUG "0x%lx: ECP settings irq=", pb->base);
                if ((configb >> 3) & 0x07)
                        pr_cont("%d", intrline[(configb >> 3) & 0x07]);
@@ -2107,9 +2086,9 @@ struct parport *parport_pc_probe_port(unsigned long int base,
 
        p->size = (p->modes & PARPORT_MODE_EPP) ? 8 : 3;
 
-       printk(KERN_INFO "%s: PC-style at 0x%lx", p->name, p->base);
+       pr_info("%s: PC-style at 0x%lx", p->name, p->base);
        if (p->base_hi && priv->ecr)
-               printk(KERN_CONT " (0x%lx)", p->base_hi);
+               pr_cont(" (0x%lx)", p->base_hi);
        if (p->irq == PARPORT_IRQ_AUTO) {
                p->irq = PARPORT_IRQ_NONE;
                parport_irq_probe(p);
@@ -2120,7 +2099,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
                p->irq = PARPORT_IRQ_NONE;
        }
        if (p->irq != PARPORT_IRQ_NONE) {
-               printk(KERN_CONT ", irq %d", p->irq);
+               pr_cont(", irq %d", p->irq);
                priv->ctr_writable |= 0x10;
 
                if (p->dma == PARPORT_DMA_AUTO) {
@@ -2144,41 +2123,39 @@ struct parport *parport_pc_probe_port(unsigned long int base,
                /* p->ops->ecp_read_data = parport_pc_ecp_read_block_pio; */
 #endif /* IEEE 1284 support */
                if (p->dma != PARPORT_DMA_NONE) {
-                       printk(KERN_CONT ", dma %d", p->dma);
+                       pr_cont(", dma %d", p->dma);
                        p->modes |= PARPORT_MODE_DMA;
                } else
-                       printk(KERN_CONT ", using FIFO");
+                       pr_cont(", using FIFO");
        } else
                /* We can't use the DMA channel after all. */
                p->dma = PARPORT_DMA_NONE;
 #endif /* Allowed to use FIFO/DMA */
 
-       printk(KERN_CONT " [");
+       pr_cont(" [");
 
-#define printmode(x) \
-       {\
-               if (p->modes & PARPORT_MODE_##x) {\
-                       printk(KERN_CONT "%s%s", f ? "," : "", #x);\
-                       f++;\
-               } \
-       }
+#define printmode(x)                                                   \
+do {                                                                   \
+       if (p->modes & PARPORT_MODE_##x)                                \
+               pr_cont("%s%s", f++ ? "," : "", #x);                    \
+} while (0)
 
        {
                int f = 0;
                printmode(PCSPP);
                printmode(TRISTATE);
-               printmode(COMPAT)
+               printmode(COMPAT);
                printmode(EPP);
                printmode(ECP);
                printmode(DMA);
        }
 #undef printmode
 #ifndef CONFIG_PARPORT_1284
-       printk(KERN_CONT "(,...)");
+       pr_cont("(,...)");
 #endif /* CONFIG_PARPORT_1284 */
-       printk(KERN_CONT "]\n");
+       pr_cont("]\n");
        if (probedirq != PARPORT_IRQ_NONE)
-               printk(KERN_INFO "%s: irq %d detected\n", p->name, probedirq);
+               pr_info("%s: irq %d detected\n", p->name, probedirq);
 
        /* If No ECP release the ports grabbed above. */
        if (ECR_res && (p->modes & PARPORT_MODE_ECP) == 0) {
@@ -2193,8 +2170,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
        if (p->irq != PARPORT_IRQ_NONE) {
                if (request_irq(p->irq, parport_irq_handler,
                                 irqflags, p->name, p)) {
-                       printk(KERN_WARNING "%s: irq %d in use, "
-                               "resorting to polled operation\n",
+                       pr_warn("%s: irq %d in use, resorting to polled operation\n",
                                p->name, p->irq);
                        p->irq = PARPORT_IRQ_NONE;
                        p->dma = PARPORT_DMA_NONE;
@@ -2204,8 +2180,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
 #ifdef HAS_DMA
                if (p->dma != PARPORT_DMA_NONE) {
                        if (request_dma(p->dma, p->name)) {
-                               printk(KERN_WARNING "%s: dma %d in use, "
-                                       "resorting to PIO operation\n",
+                               pr_warn("%s: dma %d in use, resorting to PIO operation\n",
                                        p->name, p->dma);
                                p->dma = PARPORT_DMA_NONE;
                        } else {
@@ -2215,9 +2190,7 @@ struct parport *parport_pc_probe_port(unsigned long int base,
                                                       &priv->dma_handle,
                                                       GFP_KERNEL);
                                if (!priv->dma_buf) {
-                                       printk(KERN_WARNING "%s: "
-                                               "cannot get buffer for DMA, "
-                                               "resorting to PIO operation\n",
+                                       pr_warn("%s: cannot get buffer for DMA, resorting to PIO operation\n",
                                                p->name);
                                        free_dma(p->dma);
                                        p->dma = PARPORT_DMA_NONE;
@@ -2313,7 +2286,7 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,
        int irq;
        int i;
 
-       DPRINTK(KERN_DEBUG "sio_ite_8872_probe()\n");
+       pr_debug("sio_ite_8872_probe()\n");
 
        /* make sure which one chip */
        for (i = 0; i < 5; i++) {
@@ -2330,7 +2303,7 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,
                }
        }
        if (i >= 5) {
-               printk(KERN_INFO "parport_pc: cannot find ITE8872 INTA\n");
+               pr_info("parport_pc: cannot find ITE8872 INTA\n");
                return 0;
        }
 
@@ -2339,29 +2312,28 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,
 
        switch (type) {
        case 0x2:
-               printk(KERN_INFO "parport_pc: ITE8871 found (1P)\n");
+               pr_info("parport_pc: ITE8871 found (1P)\n");
                ite8872set = 0x64200000;
                break;
        case 0xa:
-               printk(KERN_INFO "parport_pc: ITE8875 found (1P)\n");
+               pr_info("parport_pc: ITE8875 found (1P)\n");
                ite8872set = 0x64200000;
                break;
        case 0xe:
-               printk(KERN_INFO "parport_pc: ITE8872 found (2S1P)\n");
+               pr_info("parport_pc: ITE8872 found (2S1P)\n");
                ite8872set = 0x64e00000;
                break;
        case 0x6:
-               printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n");
+               pr_info("parport_pc: ITE8873 found (1S)\n");
                release_region(inta_addr[i], 32);
                return 0;
        case 0x8:
-               printk(KERN_INFO "parport_pc: ITE8874 found (2S)\n");
+               pr_info("parport_pc: ITE8874 found (2S)\n");
                release_region(inta_addr[i], 32);
                return 0;
        default:
-               printk(KERN_INFO "parport_pc: unknown ITE887x\n");
-               printk(KERN_INFO "parport_pc: please mail 'lspci -nvv' "
-                       "output to Rich.Liu@ite.com.tw\n");
+               pr_info("parport_pc: unknown ITE887x\n");
+               pr_info("parport_pc: please mail 'lspci -nvv' output to Rich.Liu@ite.com.tw\n");
                release_region(inta_addr[i], 32);
                return 0;
        }
@@ -2379,11 +2351,9 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,
        pci_write_config_dword(pdev, 0x9c,
                                ite8872set | (ite8872_irq * 0x11111));
 
-       DPRINTK(KERN_DEBUG "ITE887x: The IRQ is %d.\n", ite8872_irq);
-       DPRINTK(KERN_DEBUG "ITE887x: The PARALLEL I/O port is 0x%x.\n",
-                ite8872_lpt);
-       DPRINTK(KERN_DEBUG "ITE887x: The PARALLEL I/O porthi is 0x%x.\n",
-                ite8872_lpthi);
+       pr_debug("ITE887x: The IRQ is %d\n", ite8872_irq);
+       pr_debug("ITE887x: The PARALLEL I/O port is 0x%x\n", ite8872_lpt);
+       pr_debug("ITE887x: The PARALLEL I/O porthi is 0x%x\n", ite8872_lpthi);
 
        /* Let the user (or defaults) steer us away from interrupts */
        irq = ite8872_irq;
@@ -2396,9 +2366,8 @@ static int sio_ite_8872_probe(struct pci_dev *pdev, int autoirq, int autodma,
        release_region(inta_addr[i], 32);
        if (parport_pc_probe_port(ite8872_lpt, ite8872_lpthi,
                                   irq, PARPORT_DMA_NONE, &pdev->dev, 0)) {
-               printk(KERN_INFO
-                       "parport_pc: ITE 8872 parallel port: io=0x%X",
-                                                               ite8872_lpt);
+               pr_info("parport_pc: ITE 8872 parallel port: io=0x%X",
+                       ite8872_lpt);
                if (irq != PARPORT_IRQ_NONE)
                        pr_cont(", irq=%d", irq);
                pr_cont("\n");
@@ -2471,8 +2440,7 @@ static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
                have_epp = 1;
                break;
        default:
-               printk(KERN_DEBUG
-                       "parport_pc: probing current configuration\n");
+               printk(KERN_DEBUG "parport_pc: probing current configuration\n");
                siofunc = VIA_FUNCTION_PROBE;
                break;
        }
@@ -2508,12 +2476,11 @@ static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
        port1 = inb(VIA_CONFIG_DATA) << 2;
 
        printk(KERN_DEBUG "parport_pc: Current parallel port base: 0x%X\n",
-                                                                       port1);
+              port1);
        if (port1 == 0x3BC && have_epp) {
                outb(via->viacfg_parport_base, VIA_CONFIG_INDEX);
                outb((0x378 >> 2), VIA_CONFIG_DATA);
-               printk(KERN_DEBUG
-                       "parport_pc: Parallel port base changed to 0x378\n");
+               printk(KERN_DEBUG "parport_pc: Parallel port base changed to 0x378\n");
                port1 = 0x378;
        }
 
@@ -2525,7 +2492,7 @@ static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
        pci_write_config_byte(pdev, via->via_pci_superio_config_reg, tmp);
 
        if (siofunc == VIA_FUNCTION_PARPORT_DISABLE) {
-               printk(KERN_INFO "parport_pc: VIA parallel port disabled in BIOS\n");
+               pr_info("parport_pc: VIA parallel port disabled in BIOS\n");
                return 0;
        }
 
@@ -2558,9 +2525,8 @@ static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
        case 0x278:
                port2 = 0x678; break;
        default:
-               printk(KERN_INFO
-                       "parport_pc: Weird VIA parport base 0x%X, ignoring\n",
-                                                                       port1);
+               pr_info("parport_pc: Weird VIA parport base 0x%X, ignoring\n",
+                       port1);
                return 0;
        }
 
@@ -2579,8 +2545,7 @@ static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
 
        /* finally, do the probe with values obtained */
        if (parport_pc_probe_port(port1, port2, irq, dma, &pdev->dev, 0)) {
-               printk(KERN_INFO
-                       "parport_pc: VIA parallel port: io=0x%X", port1);
+               pr_info("parport_pc: VIA parallel port: io=0x%X", port1);
                if (irq != PARPORT_IRQ_NONE)
                        pr_cont(", irq=%d", irq);
                if (dma != PARPORT_DMA_NONE)
@@ -2589,7 +2554,7 @@ static int sio_via_probe(struct pci_dev *pdev, int autoirq, int autodma,
                return 1;
        }
 
-       printk(KERN_WARNING "parport_pc: Strange, can't probe VIA parallel port: io=0x%X, irq=%d, dma=%d\n",
+       pr_warn("parport_pc: Strange, can't probe VIA parallel port: io=0x%X, irq=%d, dma=%d\n",
                port1, irq, dma);
        return 0;
 }
@@ -2854,14 +2819,12 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
                /* TODO: test if sharing interrupts works */
                irq = dev->irq;
                if (irq == IRQ_NONE) {
-                       printk(KERN_DEBUG
-       "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n",
-                               id->vendor, id->device, io_lo, io_hi);
+                       printk(KERN_DEBUG "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx)\n",
+                              id->vendor, id->device, io_lo, io_hi);
                        irq = PARPORT_IRQ_NONE;
                } else {
-                       printk(KERN_DEBUG
-       "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n",
-                               id->vendor, id->device, io_lo, io_hi, irq);
+                       printk(KERN_DEBUG "PCI parallel port detected: %04x:%04x, I/O at %#lx(%#lx), IRQ %d\n",
+                              id->vendor, id->device, io_lo, io_hi, irq);
                }
                data->ports[count] =
                        parport_pc_probe_port(io_lo, io_hi, irq,
@@ -3111,7 +3074,7 @@ static int __init parport_parse_param(const char *s, int *val,
                if (ep != s)
                        *val = r;
                else {
-                       printk(KERN_ERR "parport: bad specifier `%s'\n", s);
+                       pr_err("parport: bad specifier `%s'\n", s);
                        return -1;
                }
        }
@@ -3133,8 +3096,8 @@ static int __init parport_parse_dma(const char *dmastr, int *val)
 #ifdef CONFIG_PCI
 static int __init parport_init_mode_setup(char *str)
 {
-       printk(KERN_DEBUG
-            "parport_pc.c: Specified parameter parport_init_mode=%s\n", str);
+       printk(KERN_DEBUG "parport_pc.c: Specified parameter parport_init_mode=%s\n",
+              str);
 
        if (!strcmp(str, "spp"))
                parport_init_mode = 1;
@@ -3201,10 +3164,7 @@ static int __init parse_parport_params(void)
                                irqval[0] = val;
                                break;
                        default:
-                               printk(KERN_WARNING
-                                       "parport_pc: irq specified "
-                                       "without base address.  Use 'io=' "
-                                       "to specify one\n");
+                               pr_warn("parport_pc: irq specified without base address.  Use 'io=' to specify one\n");
                        }
 
                if (dma[0] && !parport_parse_dma(dma[0], &val))
@@ -3214,10 +3174,7 @@ static int __init parse_parport_params(void)
                                dmaval[0] = val;
                                break;
                        default:
-                               printk(KERN_WARNING
-                                       "parport_pc: dma specified "
-                                       "without base address.  Use 'io=' "
-                                       "to specify one\n");
+                               pr_warn("parport_pc: dma specified without base address.  Use 'io=' to specify one\n");
                        }
        }
        return 0;
@@ -3256,12 +3213,12 @@ static int __init parport_setup(char *str)
 
        val = simple_strtoul(str, &endptr, 0);
        if (endptr == str) {
-               printk(KERN_WARNING "parport=%s not understood\n", str);
+               pr_warn("parport=%s not understood\n", str);
                return 1;
        }
 
        if (parport_setup_ptr == PARPORT_PC_MAX_PORTS) {
-               printk(KERN_ERR "parport=%s ignored, too many ports\n", str);
+               pr_err("parport=%s ignored, too many ports\n", str);
                return 1;
        }