Commit 3cbed330 authored by David Brownell's avatar David Brownell Committed by Tony Lindgren

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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent d1811537
...@@ -458,7 +458,7 @@ static int __init twl4030_madc_probe(struct platform_device *pdev) ...@@ -458,7 +458,7 @@ static int __init twl4030_madc_probe(struct platform_device *pdev)
ret = twl4030_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE, ret = twl4030_i2c_write_u8(TWL4030_MODULE_MAIN_CHARGE,
regval, TWL4030_BCI_BCICTL1); 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); 0, "twl4030_madc", madc);
if (ret) { if (ret) {
dev_dbg(&pdev->dev, "could not request irq\n"); dev_dbg(&pdev->dev, "could not request irq\n");
...@@ -489,7 +489,7 @@ static int __exit twl4030_madc_remove(struct platform_device *pdev) ...@@ -489,7 +489,7 @@ static int __exit twl4030_madc_remove(struct platform_device *pdev)
twl4030_madc_set_power(madc, 0); twl4030_madc_set_power(madc, 0);
twl4030_madc_set_current_generator(madc, 0, 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); cancel_work_sync(&madc->ws);
misc_deregister(&twl4030_madc_device); misc_deregister(&twl4030_madc_device);
......
...@@ -375,7 +375,7 @@ int twl4030_sih_setup(int module); ...@@ -375,7 +375,7 @@ int twl4030_sih_setup(int module);
/* #define TWL4030_MODIRQ_GPIO (TWL4030_IRQ_BASE + 0) */ /* #define TWL4030_MODIRQ_GPIO (TWL4030_IRQ_BASE + 0) */
/* #define TWL4030_MODIRQ_KEYPAD (TWL4030_IRQ_BASE + 1) */ /* #define TWL4030_MODIRQ_KEYPAD (TWL4030_IRQ_BASE + 1) */
/* #define TWL4030_MODIRQ_BCI (TWL4030_IRQ_BASE + 2) */ /* #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_USB (TWL4030_IRQ_BASE + 4) */
/* #define TWL4030_MODIRQ_PWR (TWL4030_IRQ_BASE + 5) */ /* #define TWL4030_MODIRQ_PWR (TWL4030_IRQ_BASE + 5) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment