tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mfd: Add a data argument to the WM8350 IRQ free function

To better match genirq.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

authored by

Mark Brown and committed by
Samuel Ortiz f99344fc 0e820ab6

+20 -19
+1 -1
drivers/mfd/wm8350-irq.c
··· 451 451 } 452 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 456 if (irq < 0 || irq >= WM8350_NUM_IRQ) 457 457 return -EINVAL;
+12 -12
drivers/power/wm8350_power.c
··· 428 428 429 429 static void free_charger_irq(struct wm8350 *wm8350) 430 430 { 431 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT); 432 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD); 433 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL); 434 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO); 435 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END); 436 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START); 437 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9); 438 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1); 439 - wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85); 440 - wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB); 441 - wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB); 442 - wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB); 431 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT, wm8350); 432 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD, wm8350); 433 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL, wm8350); 434 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO, wm8350); 435 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END, wm8350); 436 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START, wm8350); 437 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9, wm8350); 438 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1, wm8350); 439 + wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85, wm8350); 440 + wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB, wm8350); 441 + wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB, wm8350); 442 + wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB, wm8350); 443 443 } 444 444 445 445 static __devinit int wm8350_power_probe(struct platform_device *pdev)
+1 -1
drivers/regulator/wm8350-regulator.c
··· 1453 1453 struct regulator_dev *rdev = platform_get_drvdata(pdev); 1454 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 1458 regulator_unregister(rdev); 1459 1459
+2 -2
drivers/rtc/rtc-wm8350.c
··· 478 478 struct wm8350 *wm8350 = platform_get_drvdata(pdev); 479 479 struct wm8350_rtc *wm_rtc = &wm8350->rtc; 480 480 481 - wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC); 482 - wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM); 481 + wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350); 482 + wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350); 483 483 484 484 rtc_device_unregister(wm_rtc->rtc); 485 485
+2 -1
include/linux/mfd/wm8350/core.h
··· 680 680 int wm8350_register_irq(struct wm8350 *wm8350, int irq, 681 681 irq_handler_t handler, unsigned long flags, 682 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 685 int wm8350_mask_irq(struct wm8350 *wm8350, int irq); 685 686 int wm8350_unmask_irq(struct wm8350 *wm8350, int irq); 686 687 int wm8350_irq_init(struct wm8350 *wm8350, int irq,
+2 -2
sound/soc/codecs/wm8350.c
··· 1521 1521 WM8350_JDL_ENA | WM8350_JDR_ENA); 1522 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); 1525 - wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R); 1524 + wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_L, priv); 1525 + wm8350_free_irq(wm8350, WM8350_IRQ_CODEC_JCK_DET_R, priv); 1526 1526 1527 1527 priv->hpl.jack = NULL; 1528 1528 priv->hpr.jack = NULL;