i2c: omap: switch to platform_get_irq()
that's a nice helper from drivers core which will give us the exact IRQ number, instead of a pointer to an IRQ resource. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
This commit is contained in:
Родитель
1d7afc9594
Коммит
ac79e4b249
|
@ -993,11 +993,12 @@ omap_i2c_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct omap_i2c_dev *dev;
|
struct omap_i2c_dev *dev;
|
||||||
struct i2c_adapter *adap;
|
struct i2c_adapter *adap;
|
||||||
struct resource *mem, *irq;
|
struct resource *mem;
|
||||||
struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
|
struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
|
||||||
struct device_node *node = pdev->dev.of_node;
|
struct device_node *node = pdev->dev.of_node;
|
||||||
const struct of_device_id *match;
|
const struct of_device_id *match;
|
||||||
irq_handler_t isr;
|
irq_handler_t isr;
|
||||||
|
int irq;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
/* NOTE: driver uses the static register mapping */
|
/* NOTE: driver uses the static register mapping */
|
||||||
|
@ -1006,10 +1007,11 @@ omap_i2c_probe(struct platform_device *pdev)
|
||||||
dev_err(&pdev->dev, "no mem resource?\n");
|
dev_err(&pdev->dev, "no mem resource?\n");
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
|
||||||
if (!irq) {
|
irq = platform_get_irq(pdev, 0);
|
||||||
|
if (irq < 0) {
|
||||||
dev_err(&pdev->dev, "no irq resource?\n");
|
dev_err(&pdev->dev, "no irq resource?\n");
|
||||||
return -ENODEV;
|
return irq;
|
||||||
}
|
}
|
||||||
|
|
||||||
dev = devm_kzalloc(&pdev->dev, sizeof(struct omap_i2c_dev), GFP_KERNEL);
|
dev = devm_kzalloc(&pdev->dev, sizeof(struct omap_i2c_dev), GFP_KERNEL);
|
||||||
|
@ -1043,7 +1045,7 @@ omap_i2c_probe(struct platform_device *pdev)
|
||||||
}
|
}
|
||||||
|
|
||||||
dev->dev = &pdev->dev;
|
dev->dev = &pdev->dev;
|
||||||
dev->irq = irq->start;
|
dev->irq = irq;
|
||||||
|
|
||||||
platform_set_drvdata(pdev, dev);
|
platform_set_drvdata(pdev, dev);
|
||||||
init_completion(&dev->cmd_complete);
|
init_completion(&dev->cmd_complete);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче