diff options
| author | Shinya Kuribayashi <shinya.kuribayashi@necel.com> | 2009-11-06 21:45:07 +0900 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2009-12-09 00:19:10 +0000 |
| commit | 91b52caec040064b4df540b72ad7f18a22fd0508 (patch) | |
| tree | 234d9535c382402847d467a5ba688e4c373e9159 /drivers/i2c | |
| parent | e28000a38da803de8d90727bec45f3d7c831a59a (diff) | |
| download | kernel_samsung_aries-91b52caec040064b4df540b72ad7f18a22fd0508.zip kernel_samsung_aries-91b52caec040064b4df540b72ad7f18a22fd0508.tar.gz kernel_samsung_aries-91b52caec040064b4df540b72ad7f18a22fd0508.tar.bz2 | |
i2c-designware: Use platform_get_irq helper
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>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-designware.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index eeb1915..139f555 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c @@ -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); @@ -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), @@ -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); |