]> git.karo-electronics.de Git - linux-beck.git/commitdiff
pata_of_platform: Remove "electra-ide" quirk
authorAlexander Shiyan <shc_work@mail.ru>
Sat, 23 Aug 2014 10:46:10 +0000 (14:46 +0400)
committerTejun Heo <tj@kernel.org>
Sat, 23 Aug 2014 17:04:02 +0000 (13:04 -0400)
"electra-ide" is not used anywhere in the kernel and could be
represented in devicetree in a normal way.
This patch removes specific quirk for "electra-ide".

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Tejun Heo <tj@kernel.org>
drivers/ata/pata_of_platform.c

index a7e95a54c7827582c5a47344cb3dcc313e53ce22..6af1c9b9a464092114f4b60a9add28c2a2f7db45 100644 (file)
@@ -35,20 +35,11 @@ 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);
@@ -79,8 +70,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);