Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pata_of_platform.c

diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index a7e95a54c7827582c5a47344cb3dcc313e53ce22..64965398914a7b28cf78b11cffd2e129c7de5890 100644 (file)
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -35,25 +35,14 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
                return -EINVAL;
        }
 
-       if (of_device_is_compatible(dn, "electra-ide")) {
-               /* Altstatus is really at offset 0x3f6 from the primary window
-                * on electra-ide. Adjust ctl_res and io_res accordingly.
-                */
-               ctl_res = io_res;
-               ctl_res.start = ctl_res.start+0x3f6;
-               io_res.end = ctl_res.start-1;
-       } else {
-               ret = of_address_to_resource(dn, 1, &ctl_res);
-               if (ret) {
-                       dev_err(&ofdev->dev, "can't get CTL address from "
-                               "device tree\n");
-                       return -EINVAL;
-               }
+       ret = of_address_to_resource(dn, 1, &ctl_res);
+       if (ret) {
+               dev_err(&ofdev->dev, "can't get CTL address from "
+                       "device tree\n");
+               return -EINVAL;
        }
 
        irq_res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0);
-       if (irq_res)
-               irq_res->flags = 0;
 
        prop = of_get_property(dn, "reg-shift", NULL);
        if (prop)
@@ -79,8 +68,7 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
 
 static struct of_device_id pata_of_platform_match[] = {
        { .compatible = "ata-generic", },
-       { .compatible = "electra-ide", },
-       {},
+       { },
 };
 MODULE_DEVICE_TABLE(of, pata_of_platform_match);