From 3cbed330ac327b6796e20f8e0e7ff793cd468179 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 19 Nov 2008 17:28:16 -0800 Subject: [PATCH] twl4030 MADC irq Disable the TWL4030_MODIRQ_MADC symbol and remove all its uses. It's not needed any more now that platform_get_irq() works for these MADC devices. Signed-off-by: David Brownell Signed-off-by: Tony Lindgren --- drivers/i2c/chips/twl4030-madc.c | 4 ++-- include/linux/i2c/twl4030.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/chips/twl4030-madc.c b/drivers/i2c/chips/twl4030-madc.c index c17c7fe9d6d..19dacf5f706 100644 --- a/drivers/i2c/chips/twl4030-madc.c +++ b/drivers/i2c/chips/twl4030-madc.c @@ -458,7 +458,7 @@ static int __init twl4030_madc_probe(struct platform_device *pdev) ret = twl4030_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, regval, TWL4030_BCI_BCICTL1); - ret = request_irq(TWL4030_MODIRQ_MADC, twl4030_madc_irq_handler, + ret = request_irq(platform_get_irq(pdev, 0), twl4030_madc_irq_handler, 0, "twl4030_madc", madc); if (ret) { dev_dbg(&pdev->dev, "could not request irq\n"); @@ -489,7 +489,7 @@ static int __exit twl4030_madc_remove(struct platform_device *pdev) twl4030_madc_set_power(madc, 0); twl4030_madc_set_current_generator(madc, 0, 0); - free_irq(TWL4030_MODIRQ_MADC, madc); + free_irq(platform_get_irq(pdev, 0), madc); cancel_work_sync(&madc->ws); misc_deregister(&twl4030_madc_device); diff --git a/include/linux/i2c/twl4030.h b/include/linux/i2c/twl4030.h index 84f31d19641..fd123ce150e 100644 --- a/include/linux/i2c/twl4030.h +++ b/include/linux/i2c/twl4030.h @@ -375,7 +375,7 @@ int twl4030_sih_setup(int module); /* #define TWL4030_MODIRQ_GPIO (TWL4030_IRQ_BASE + 0) */ /* #define TWL4030_MODIRQ_KEYPAD (TWL4030_IRQ_BASE + 1) */ /* #define TWL4030_MODIRQ_BCI (TWL4030_IRQ_BASE + 2) */ -#define TWL4030_MODIRQ_MADC (TWL4030_IRQ_BASE + 3) +/* #define TWL4030_MODIRQ_MADC (TWL4030_IRQ_BASE + 3) */ /* #define TWL4030_MODIRQ_USB (TWL4030_IRQ_BASE + 4) */ /* #define TWL4030_MODIRQ_PWR (TWL4030_IRQ_BASE + 5) */ -- 2.41.1