|
@@ -267,7 +267,8 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
|
|
|
{
|
|
|
struct ocores_i2c *i2c;
|
|
|
struct ocores_i2c_platform_data *pdata;
|
|
|
- struct resource *res, *res2;
|
|
|
+ struct resource *res;
|
|
|
+ int irq;
|
|
|
int ret;
|
|
|
int i;
|
|
|
|
|
@@ -275,9 +276,9 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
|
|
|
if (!res)
|
|
|
return -ENODEV;
|
|
|
|
|
|
- res2 = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
|
- if (!res2)
|
|
|
- return -ENODEV;
|
|
|
+ irq = platform_get_irq(pdev, 0);
|
|
|
+ if (irq < 0)
|
|
|
+ return irq;
|
|
|
|
|
|
i2c = devm_kzalloc(&pdev->dev, sizeof(*i2c), GFP_KERNEL);
|
|
|
if (!i2c)
|
|
@@ -304,7 +305,7 @@ static int __devinit ocores_i2c_probe(struct platform_device *pdev)
|
|
|
ocores_init(i2c);
|
|
|
|
|
|
init_waitqueue_head(&i2c->wait);
|
|
|
- ret = devm_request_irq(&pdev->dev, res2->start, ocores_isr, 0,
|
|
|
+ ret = devm_request_irq(&pdev->dev, irq, ocores_isr, 0,
|
|
|
pdev->name, i2c);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "Cannot claim IRQ\n");
|