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

Commit 2e64d7b1 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>
[Tom: fix backport to 5.4.y]

AUTOSEL backport to 5.4.y of:
b13fecb1c3a6 ("treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()")
changed all locations of DECLARE_TASKLET with DECLARE_TASKLET_OLD,
except one, in arch/mips/lasat/pcivue_proc.c.

This is due to:
10760dde9be3 ("MIPS: Remove support for LASAT") preceeding
b13fecb1c3a6 ("treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()")
upstream and the former not being present in 5.4.y.

Fix this by changing DECLARE_TASKLET to DECLARE_TASKLET_OLD in
arch/mips/lasat/pcivue_proc.c.

Fixes: 5de7a425 ("treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()")
Reported-by: default avatar"kernelci.org bot" <bot@kernelci.org>
Signed-off-by: default avatarTom Saeger <tom.saeger@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19919766

arch/mips/lasat/picvue_proc.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static void pvc_display(unsigned long data) 
		pvc_write_string(pvc_lines[i], 0, i);

}



static DECLARE_TASKLET(pvc_display_tasklet, &pvc_display, 0);

static DECLARE_TASKLET_OLD(pvc_display_tasklet, &pvc_display);



static int pvc_line_proc_show(struct seq_file *m, void *v)

{

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);