diff options
-rw-r--r-- | drivers/mfd/wm8350-irq.c | 2 | ||||
-rw-r--r-- | drivers/power/wm8350_power.c | 24 | ||||
-rw-r--r-- | drivers/regulator/wm8350-regulator.c | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-wm8350.c | 4 | ||||
-rw-r--r-- | include/linux/mfd/wm8350/core.h | 3 | ||||
-rw-r--r-- | sound/soc/codecs/wm8350.c | 4 |
6 files changed, 20 insertions, 19 deletions
diff --git a/drivers/mfd/wm8350-irq.c b/drivers/mfd/wm8350-irq.c index 9025f29e270..655836bc69a 100644 --- a/drivers/mfd/wm8350-irq.c +++ b/drivers/mfd/wm8350-irq.c | |||
@@ -451,7 +451,7 @@ int wm8350_register_irq(struct wm8350 *wm8350, int irq, | |||
451 | } | 451 | } |
452 | EXPORT_SYMBOL_GPL(wm8350_register_irq); | 452 | EXPORT_SYMBOL_GPL(wm8350_register_irq); |
453 | 453 | ||
454 | int wm8350_free_irq(struct wm8350 *wm8350, int irq) | 454 | int wm8350_free_irq(struct wm8350 *wm8350, int irq, void *data) |
455 | { | 455 | { |
456 | if (irq < 0 || irq >= WM8350_NUM_IRQ) | 456 | if (irq < 0 || irq >= WM8350_NUM_IRQ) |
457 | return -EINVAL; | 457 | return -EINVAL; |
diff --git a/drivers/power/wm8350_power.c b/drivers/power/wm8350_power.c index ad4f071e128..3839a5e1c4a 100644 --- a/drivers/power/wm8350_power.c +++ b/drivers/power/wm8350_power.c | |||
@@ -428,18 +428,18 @@ static void wm8350_init_charger(struct wm8350 *wm8350) | |||
428 | 428 | ||
429 | static void free_charger_irq(struct wm8350 *wm8350) | 429 | static void free_charger_irq(struct wm8350 *wm8350) |
430 | { | 430 | { |
431 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT); | 431 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT, wm8350); |
432 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD); | 432 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD, wm8350); |
433 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL); | 433 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL, wm8350); |
434 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO); | 434 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO, wm8350); |
435 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END); | 435 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END, wm8350); |
436 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START); | 436 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START, wm8350); |
437 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9); | 437 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9, wm8350); |
438 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1); | 438 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1, wm8350); |
439 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85); | 439 | wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85, wm8350); |
440 | wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB); | 440 | wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB, wm8350); |
441 | wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB); | 441 | wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB, wm8350); |
442 | wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB); | 442 | wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB, wm8350); |
443 | } | 443 | } |
444 | 444 | ||
445 | static __devinit int wm8350_power_probe(struct platform_device *pdev) | 445 | static __devinit int wm8350_power_probe(struct platform_device *pdev) |
diff --git a/drivers/regulator/wm8350-regulator.c b/drivers/regulator/wm8350-regulator.c index 94227dd6ba7..723cd1fb486 100644 --- a/drivers/regulator/wm8350-regulator.c +++ b/drivers/regulator/wm8350-regulator.c | |||
@@ -1453,7 +1453,7 @@ static int wm8350_regulator_remove(struct platform_device *pdev) | |||
1453 | struct regulator_dev *rdev = platform_get_drvdata(pdev); | 1453 | struct regulator_dev *rdev = platform_get_drvdata(pdev); |
1454 | struct wm8350 *wm8350 = rdev_get_drvdata(rdev); | 1454 | struct wm8350 *wm8350 = rdev_get_drvdata(rdev); |
1455 | 1455 | ||
1456 | wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq); | 1456 | wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq, rdev); |
1457 | 1457 | ||
1458 | regulator_unregister(rdev); | 1458 | regulator_unregister(rdev); |
1459 | 1459 | ||
diff --git a/drivers/rtc/rtc-wm8350.c b/drivers/rtc/rtc-wm8350.c index f1e440521c5..a5512f51599 100644 --- a/drivers/rtc/rtc-wm8350.c +++ b/drivers/rtc/rtc-wm8350.c | |||
@@ -478,8 +478,8 @@ static int __devexit wm8350_rtc_remove(struct platform_device *pdev) | |||
478 | struct wm8350 *wm8350 = platform_get_drvdata(pdev); | 478 | struct wm8350 *wm8350 = platform_get_drvdata(pdev); |
479 | struct wm8350_rtc *wm_rtc = &wm8350->rtc; | 479 | struct wm8350_rtc *wm_rtc = &wm8350->rtc; |
480 | 480 | ||
481 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC); | 481 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350); |
482 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM); | 482 | wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350); |
483 | 483 | ||
484 | rtc_device_unregister(wm_rtc->rtc); | 484 | rtc_device_unregister(wm_rtc->rtc); |
485 | 485 | ||
diff --git a/include/linux/mfd/wm8350/core.h b/include/linux/mfd/wm8350/core.h index 43868899bf4..8883125ddea 100644 --- a/include/linux/mfd/wm8350/core.h +++ b/include/linux/mfd/wm8350/core.h | |||
@@ -680,7 +680,8 @@ int wm8350_block_write(struct wm8350 *wm8350, int reg, int size, u16 *src); | |||
680 | int wm8350_register_irq(struct wm8350 *wm8350, int irq, | 680 | int wm8350_register_irq(struct wm8350 *wm8350, int irq, |
681 | irq_handler_t handler, unsigned long flags, | 681 | irq_handler_t handler, unsigned long flags, |
682 | const char *name, void *data); | 682 | const char *name, void *data); |
683 | int wm8350_free_irq(struct wm8350 *wm8350, int irq); | 683 | int wm8350_free_irq(struct wm8350 *wm8350, int irq, void *data); |
684 | |||
684 | int wm8350_mask_irq(struct wm8350 *wm8350, int irq); | 685 | int wm8350_mask_irq(struct wm8350 *wm8350, int irq); |
685 | int wm8350_unmask_irq(struct wm8350 *wm8350, int irq); | 686 | int wm8350_unmask_irq(struct wm8350 *wm8350, int irq); |
686 | int wm8350_irq_init(struct wm8350 *wm8350, int irq, | 687 | int wm8350_irq_init(struct wm8350 *wm8350, int irq, |
diff --git a/sound/soc/codecs/wm8350.c b/sound/soc/codecs/wm8350.c index 718ef912e75..079bf745bf0 100644 --- a/sound/soc/codecs/wm8350.c +++ b/sound/soc/codecs/wm8350.c | |||
@@ -1521,8 +1521,8 @@ static int wm8350_remove(struct platform_device *pdev) | |||
1521 | WM8350_JDL_ENA | WM8350_JDR_ENA); | 1521 | WM8350_JDL_ENA | WM8350_JDR_ENA); |
1522 | wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA); | 1522 | wm8350_clear_bits(wm8350, WM8350_POWER_MGMT_4, WM8350_TOCLK_ENA); |
1523 | 1523 | ||
1524 | wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L); | 1524 | wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L, priv); |
1525 | wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R); | 1525 | wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R, priv); |
1526 | 1526 | ||
1527 | priv->hpl.jack = NULL; | 1527 | priv->hpl.jack = NULL; |
1528 | priv->hpr.jack = NULL; | 1528 | priv->hpr.jack = NULL; |