aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-08-23 06:45:47 -0400
committerTejun Heo <tj@kernel.org>2014-08-23 13:05:08 -0400
commit53f3cc46336b9e514c98556b4a009a69ed808d3b (patch)
treeaaa6199a54836ae9d7f8c1021134b45feb6f1fdb /drivers/ata
parentca99140a63b7326ee9a38f64c326317f2c63b594 (diff)
pata_platform: Remove useless irq_flags field
IRQ flags can be obtained from resource structure, there are no need to use additional field in the platform_data to store these values. This patch removes this field and convert existing users of this driver to use IRQ flags from the resources. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/pata_of_platform.c2
-rw-r--r--drivers/ata/pata_platform.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 6af1c9b9a464..64965398914a 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -43,8 +43,6 @@ static int pata_of_platform_probe(struct platform_device *ofdev)
43 } 43 }
44 44
45 irq_res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0); 45 irq_res = platform_get_resource(ofdev, IORESOURCE_IRQ, 0);
46 if (irq_res)
47 irq_res->flags = 0;
48 46
49 prop = of_get_property(dn, "reg-shift", NULL); 47 prop = of_get_property(dn, "reg-shift", NULL);
50 if (prop) 48 if (prop)
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index a5579b55e332..f8cff3e247c5 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -118,7 +118,7 @@ int __pata_platform_probe(struct device *dev, struct resource *io_res,
118 */ 118 */
119 if (irq_res && irq_res->start > 0) { 119 if (irq_res && irq_res->start > 0) {
120 irq = irq_res->start; 120 irq = irq_res->start;
121 irq_flags = irq_res->flags; 121 irq_flags = irq_res->flags & IRQF_TRIGGER_MASK;
122 } 122 }
123 123
124 /* 124 /*
@@ -213,8 +213,6 @@ static int pata_platform_probe(struct platform_device *pdev)
213 * And the IRQ 213 * And the IRQ
214 */ 214 */
215 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); 215 irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
216 if (irq_res)
217 irq_res->flags = pp_info ? pp_info->irq_flags : 0;
218 216
219 return __pata_platform_probe(&pdev->dev, io_res, ctl_res, irq_res, 217 return __pata_platform_probe(&pdev->dev, io_res, ctl_res, irq_res,
220 pp_info ? pp_info->ioport_shift : 0, 218 pp_info ? pp_info->ioport_shift : 0,