Commit f99344fc authored by Mark Brown's avatar Mark Brown Committed by Samuel Ortiz
Browse files

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



To better match genirq.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 0e820ab6

drivers/mfd/wm8350-irq.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ int wm8350_register_irq(struct wm8350 *wm8350, int irq, 
}

EXPORT_SYMBOL_GPL(wm8350_register_irq);



int wm8350_free_irq(struct wm8350 *wm8350, int irq)

int wm8350_free_irq(struct wm8350 *wm8350, int irq, void *data)

{

	if (irq < 0 || irq >= WM8350_NUM_IRQ)

		return -EINVAL;

drivers/power/wm8350_power.c

+12 −12
Original line number Diff line number Diff line
@@ -428,18 +428,18 @@ static void wm8350_init_charger(struct wm8350 *wm8350) 


static void free_charger_irq(struct wm8350 *wm8350)

{

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85);

	wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB);

	wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB);

	wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_HOT, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_COLD, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_BAT_FAIL, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_TO, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_END, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_START, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P9, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_3P1, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_CHG_VBATT_LT_2P85, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_EXT_USB_FB, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_EXT_WALL_FB, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_EXT_BAT_FB, wm8350);

}



static __devinit int wm8350_power_probe(struct platform_device *pdev)

drivers/regulator/wm8350-regulator.c

+1 −1
Original line number Diff line number Diff line
@@ -1453,7 +1453,7 @@ static int wm8350_regulator_remove(struct platform_device *pdev) 
	struct regulator_dev *rdev = platform_get_drvdata(pdev);

	struct wm8350 *wm8350 = rdev_get_drvdata(rdev);



	wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq);

	wm8350_free_irq(wm8350, wm8350_reg[pdev->id].irq, rdev);



	regulator_unregister(rdev);

drivers/rtc/rtc-wm8350.c

+2 −2
Original line number Diff line number Diff line
@@ -478,8 +478,8 @@ static int __devexit wm8350_rtc_remove(struct platform_device *pdev) 
	struct wm8350 *wm8350 = platform_get_drvdata(pdev);

	struct wm8350_rtc *wm_rtc = &wm8350->rtc;



	wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC);

	wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM);

	wm8350_free_irq(wm8350, WM8350_IRQ_RTC_SEC, wm8350);

	wm8350_free_irq(wm8350, WM8350_IRQ_RTC_ALM, wm8350);



	rtc_device_unregister(wm_rtc->rtc);

include/linux/mfd/wm8350/core.h

+2 −1
Original line number Diff line number Diff line
@@ -680,7 +680,8 @@ int wm8350_block_write(struct wm8350 *wm8350, int reg, int size, u16 *src); 
int wm8350_register_irq(struct wm8350 *wm8350, int irq,

			irq_handler_t handler, unsigned long flags,

			const char *name, void *data);

int wm8350_free_irq(struct wm8350 *wm8350, int irq);

int wm8350_free_irq(struct wm8350 *wm8350, int irq, void *data);



int wm8350_mask_irq(struct wm8350 *wm8350, int irq);

int wm8350_unmask_irq(struct wm8350 *wm8350, int irq);

int wm8350_irq_init(struct wm8350 *wm8350, int irq,