Commit e1d8f312 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Arnd Bergmann
Browse files

Input: wm97xx - get rid of irq_enable method in wm97xx_mach_ops 



Now that we are using oneshot threaded IRQ this method is not used anymore.

Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
[arnd: add the db1300 change as well]
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a2ef9261

arch/mips/alchemy/devboards/db1300.c

+0 −9
Original line number Diff line number Diff line
@@ -732,16 +732,7 @@ static struct platform_device db1300_lcd_dev = { 
/**********************************************************************/



#if IS_ENABLED(CONFIG_TOUCHSCREEN_WM97XX)

static void db1300_wm97xx_irqen(struct wm97xx *wm, int enable)

{

	if (enable)

		enable_irq(DB1300_AC97_PEN_INT);

	else

		disable_irq_nosync(DB1300_AC97_PEN_INT);

}



static struct wm97xx_mach_ops db1300_wm97xx_ops = {

	.irq_enable	= db1300_wm97xx_irqen,

	.irq_gpio	= WM97XX_GPIO_3,

};

drivers/input/touchscreen/mainstone-wm97xx.c

+0 −9
Original line number Diff line number Diff line
@@ -246,21 +246,12 @@ static void wm97xx_acc_shutdown(struct wm97xx *wm) 
	}

}



static void wm97xx_irq_enable(struct wm97xx *wm, int enable)

{

	if (enable)

		enable_irq(wm->pen_irq);

	else

		disable_irq_nosync(wm->pen_irq);

}



static struct wm97xx_mach_ops mainstone_mach_ops = {

	.acc_enabled	= 1,

	.acc_pen_up	= wm97xx_acc_pen_up,

	.acc_pen_down	= wm97xx_acc_pen_down,

	.acc_startup	= wm97xx_acc_startup,

	.acc_shutdown	= wm97xx_acc_shutdown,

	.irq_enable	= wm97xx_irq_enable,

	.irq_gpio	= WM97XX_GPIO_2,

};

drivers/input/touchscreen/zylonite-wm97xx.c

+0 −9
Original line number Diff line number Diff line
@@ -160,20 +160,11 @@ static int wm97xx_acc_startup(struct wm97xx *wm) 
	return 0;

}



static void wm97xx_irq_enable(struct wm97xx *wm, int enable)

{

	if (enable)

		enable_irq(wm->pen_irq);

	else

		disable_irq_nosync(wm->pen_irq);

}



static struct wm97xx_mach_ops zylonite_mach_ops = {

	.acc_enabled	= 1,

	.acc_pen_up	= wm97xx_acc_pen_up,

	.acc_pen_down	= wm97xx_acc_pen_down,

	.acc_startup	= wm97xx_acc_startup,

	.irq_enable	= wm97xx_irq_enable,

	.irq_gpio	= WM97XX_GPIO_2,

};

include/linux/wm97xx.h

+0 −3
Original line number Diff line number Diff line
@@ -254,9 +254,6 @@ struct wm97xx_mach_ops { 
	int (*acc_startup) (struct wm97xx *);

	void (*acc_shutdown) (struct wm97xx *);



	/* interrupt mask control - required for accelerated operation */

	void (*irq_enable) (struct wm97xx *, int enable);



	/* GPIO pin used for accelerated operation */

	int irq_gpio;