diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2014-08-23 12:46:10 +0200 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2014-08-23 19:04:02 +0200 |
| commit | ca99140a63b7326ee9a38f64c326317f2c63b594 (patch) | |
| tree | 146aa26ad29da747da13bb88df6e8df67bc3472a /drivers/ata/pata_of_platform.c | |
| parent | libata: Use dev_name() for request_irq() to distinguish devices (diff) | |
| download | linux-ca99140a63b7326ee9a38f64c326317f2c63b594.tar.xz linux-ca99140a63b7326ee9a38f64c326317f2c63b594.zip | |
pata_of_platform: Remove "electra-ide" quirk
"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>
Diffstat (limited to 'drivers/ata/pata_of_platform.c')
| -rw-r--r-- | drivers/ata/pata_of_platform.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c index a7e95a54c782..6af1c9b9a464 100644 --- a/drivers/ata/pata_of_platform.c +++ b/drivers/ata/pata_of_platform.c @@ -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); |