Skip to content

Commit

Permalink
i2c-designware: Use platform_get_irq helper
Browse files Browse the repository at this point in the history
Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi@necel.com>
Acked-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
  • Loading branch information
Shinya Kuribayashi authored and Ben Dooks committed Dec 9, 2009
1 parent e28000a commit 91b52ca
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/i2c/busses/i2c-designware.c
Original file line number Diff line number Diff line change
Expand Up @@ -548,8 +548,8 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
{
struct dw_i2c_dev *dev;
struct i2c_adapter *adap;
struct resource *mem, *irq, *ioarea;
int r;
struct resource *mem, *ioarea;
int irq, r;

/* NOTE: driver uses the static register mapping */
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
Expand All @@ -558,10 +558,10 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
return -EINVAL;
}

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");
return -EINVAL;
return irq; /* -ENXIO */
}

ioarea = request_mem_region(mem->start, resource_size(mem),
Expand All @@ -581,7 +581,7 @@ static int __devinit dw_i2c_probe(struct platform_device *pdev)
tasklet_init(&dev->pump_msg, dw_i2c_pump_msg, (unsigned long) dev);
mutex_init(&dev->lock);
dev->dev = get_device(&pdev->dev);
dev->irq = irq->start;
dev->irq = irq;
platform_set_drvdata(pdev, dev);

dev->clk = clk_get(&pdev->dev, NULL);
Expand Down

0 comments on commit 91b52ca

Please sign in to comment.