Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / parport / parport_pc.c

diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c
index 0950fa40684fa046941d19c6114eebac2e88e1ed..f330338c2f2231b0af7c603447428862ce8a4f8f 100644 (file)
--- a/drivers/parport/parport_pc.c
+++ b/drivers/parport/parport_pc.c
@@ -1488,7 +1488,7 @@ static void __devinit winbond_check(int io, int key)
 
        outb(key, io);
        outb(key, io);     /* Write Magic Sequence to EFER, extended
-                             funtion enable register */
+                             function enable register */
        outb(0x20, io);    /* Write EFIR, extended function index register */
        devid = inb(io + 1);  /* Read EFDR, extended function data register */
        outb(0x21, io);
@@ -1527,7 +1527,7 @@ static void __devinit winbond_check2(int io, int key)
        x_oldid = inb(io + 2);
 
        outb(key, io);     /* Write Magic Byte to EFER, extended
-                             funtion enable register */
+                             function enable register */
        outb(0x20, io + 2);  /* Write EFIR, extended function index register */
        devid = inb(io + 2);  /* Read EFDR, extended function data register */
        outb(0x21, io + 1);
@@ -1569,7 +1569,7 @@ static void __devinit smsc_check(int io, int key)
 
        outb(key, io);
        outb(key, io);     /* Write Magic Sequence to EFER, extended
-                             funtion enable register */
+                             function enable register */
        outb(0x0d, io);    /* Write EFIR, extended function index register */
        oldid = inb(io + 1);  /* Read EFDR, extended function data register */
        outb(0x0e, io);
@@ -1621,7 +1621,7 @@ static void __devinit detect_and_report_it87(void)
        u8 origval, r;
        if (verbose_probing)
                printk(KERN_DEBUG "IT8705 Super-IO detection, now testing port 2E ...\n");
-       if (!request_region(0x2e, 2, __func__))
+       if (!request_muxed_region(0x2e, 2, __func__))
                return;
        origval = inb(0x2e);            /* Save original value */
        outb(0x87, 0x2e);
@@ -2550,7 +2550,6 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
                                         const struct parport_pc_via_data *via)
 {
        short inta_addr[6] = { 0x2A0, 0x2C0, 0x220, 0x240, 0x1E0 };
-       struct resource *base_res;
        u32 ite8872set;
        u32 ite8872_lpt, ite8872_lpthi;
        u8 ite8872_irq, type;
@@ -2561,8 +2560,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
 
        /* make sure which one chip */
        for (i = 0; i < 5; i++) {
-               base_res = request_region(inta_addr[i], 32, "it887x");
-               if (base_res) {
+               if (request_region(inta_addr[i], 32, "it887x")) {
                        int test;
                        pci_write_config_dword(pdev, 0x60,
                                                0xe5000000 | inta_addr[i]);
@@ -2571,7 +2569,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
                        test = inb(inta_addr[i]);
                        if (test != 0xff)
                                break;
-                       release_region(inta_addr[i], 0x8);
+                       release_region(inta_addr[i], 32);
                }
        }
        if (i >= 5) {
@@ -2599,7 +2597,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
                printk(KERN_INFO "parport_pc: ITE8873 found (1S)\n");
                return 0;
        case 0x8:
-               DPRINTK(KERN_DEBUG "parport_pc: ITE8874 found (2S)\n");
+               printk(KERN_INFO "parport_pc: ITE8874 found (2S)\n");
                return 0;
        default:
                printk(KERN_INFO "parport_pc: unknown ITE887x\n");
@@ -2635,7 +2633,7 @@ static int __devinit sio_ite_8872_probe(struct pci_dev *pdev, int autoirq,
        /*
         * Release the resource so that parport_pc_probe_port can get it.
         */
-       release_resource(base_res);
+       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