diff options
author | Andreas Larsson <andreas@gaisler.com> | 2012-11-15 10:50:58 -0500 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2012-11-16 12:22:29 -0500 |
commit | f5f35a92e44a1f70fd8c77a42339318a5c8d9eb7 (patch) | |
tree | 6eb770e22f892f3c7b9d9614ad2f74e990de1427 /drivers/i2c | |
parent | 1ab3604595af478e9feea430318c22899015550c (diff) |
i2c: ocores: Add irq support for sparc
Add sparc support by using platform_get_irq instead of platform_get_resource.
There are no platform resources of type IORESOURCE_IRQ for sparc, but
platform_get_irq works for sparc. In the non-sparc case platform_get_irq
internally uses platform_get_resource.
Signed-off-by: Andreas Larsson <andreas@gaisler.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r-- | drivers/i2c/busses/i2c-ocores.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 1fad4aeb7902..dafd26beecbb 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c | |||
@@ -267,7 +267,8 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) | |||
267 | { | 267 | { |
268 | struct ocores_i2c *i2c; | 268 | struct ocores_i2c *i2c; |
269 | struct ocores_i2c_platform_data *pdata; | 269 | struct ocores_i2c_platform_data *pdata; |
270 | struct resource *res, *res2; | 270 | struct resource *res; |
271 | int irq; | ||
271 | int ret; | 272 | int ret; |
272 | int i; | 273 | int i; |
273 | 274 | ||
@@ -275,9 +276,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) | |||
275 | if (!res) | 276 | if (!res) |
276 | return -ENODEV; | 277 | return -ENODEV; |
277 | 278 | ||
278 | res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0); | 279 | irq = platform_get_irq(pdev, 0); |
279 | if (!res2) | 280 | if (irq < 0) |
280 | return -ENODEV; | 281 | return irq; |
281 | 282 | ||
282 | i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL); | 283 | i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL); |
283 | if (!i2c) | 284 | if (!i2c) |
@@ -304,7 +305,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev) | |||
304 | ocores_init(i2c); | 305 | ocores_init(i2c); |
305 | 306 | ||
306 | init_waitqueue_head(&i2c->wait); | 307 | init_waitqueue_head(&i2c->wait); |
307 | ret = devm_request_irq(&pdev->dev, res2->start, ocores_isr, 0, | 308 | ret = devm_request_irq(&pdev->dev, irq, ocores_isr, 0, |
308 | pdev->name, i2c); | 309 | pdev->name, i2c); |
309 | if (ret) { | 310 | if (ret) { |
310 | dev_err(&pdev->dev, "Cannot claim IRQ\n"); | 311 | dev_err(&pdev->dev, "Cannot claim IRQ\n"); |