Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5de7a425 authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD() 



[ Upstream commit b13fecb1c3a603c4b8e99b306fecf4f668c11b32 ]

This converts all the existing DECLARE_TASKLET() (and ...DISABLED)
macros with DECLARE_TASKLET_OLD() in preparation for refactoring the
tasklet callback type. All existing DECLARE_TASKLET() users had a "0"
data argument, it has been removed here as well.

Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Stable-dep-of: 1fdeb8b9f29d ("wifi: iwl3945: Add missing check for create_singlethread_workqueue")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 9198eefd

drivers/input/keyboard/omap-keypad.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ struct omap_kp { 
	unsigned short keymap[];

};



static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0);

static DECLARE_TASKLET_DISABLED_OLD(kp_tasklet, omap_kp_tasklet);



static unsigned int *row_gpios;

static unsigned int *col_gpios;

drivers/input/serio/hil_mlc.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ static struct timer_list hil_mlcs_kicker; 
static int			hil_mlcs_probe, hil_mlc_stop;



static void hil_mlcs_process(unsigned long unused);

static DECLARE_TASKLET_DISABLED(hil_mlcs_tasklet, hil_mlcs_process, 0);

static DECLARE_TASKLET_DISABLED_OLD(hil_mlcs_tasklet, hil_mlcs_process);





/* #define HIL_MLC_DEBUG */

drivers/net/wan/farsync.c

+2 −2
Original line number Diff line number Diff line
@@ -569,8 +569,8 @@ static void do_bottom_half_rx(struct fst_card_info *card); 
static void fst_process_tx_work_q(unsigned long work_q);

static void fst_process_int_work_q(unsigned long work_q);



static DECLARE_TASKLET(fst_tx_task, fst_process_tx_work_q, 0);

static DECLARE_TASKLET(fst_int_task, fst_process_int_work_q, 0);

static DECLARE_TASKLET_OLD(fst_tx_task, fst_process_tx_work_q);

static DECLARE_TASKLET_OLD(fst_int_task, fst_process_int_work_q);



static struct fst_card_info *fst_card_array[FST_MAX_CARDS];

static spinlock_t fst_work_q_lock;

drivers/s390/crypto/ap_bus.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static DECLARE_WORK(ap_scan_work, ap_scan_bus); 
 * Tasklet & timer for AP request polling and interrupts

 */

static void ap_tasklet_fn(unsigned long);

static DECLARE_TASKLET(ap_tasklet, ap_tasklet_fn, 0);

static DECLARE_TASKLET_OLD(ap_tasklet, ap_tasklet_fn);

static DECLARE_WAIT_QUEUE_HEAD(ap_poll_wait);

static struct task_struct *ap_poll_kthread;

static DEFINE_MUTEX(ap_poll_thread_mutex);

drivers/staging/most/dim2/dim2.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ MODULE_PARM_DESC(fcnt, "Num of frames per sub-buffer for sync channels as a powe 
static DEFINE_SPINLOCK(dim_lock);



static void dim2_tasklet_fn(unsigned long data);

static DECLARE_TASKLET(dim2_tasklet, dim2_tasklet_fn, 0);

static DECLARE_TASKLET_OLD(dim2_tasklet, dim2_tasklet_fn);



/**

 * struct hdm_channel - private structure to keep channel specific data