Commit 427714f2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'tasklets-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux 

Pull tasklets API update from Kees Cook:
 "These are the infrastructure updates needed to support converting the
  tasklet API to something more modern (and hopefully for removal
  further down the road).

  There is a 300-patch series waiting in the wings to get set out to
  subsystem maintainers, but these changes need to be present in the
  kernel first. Since this has some treewide changes, I carried this
  series for -next instead of paining Thomas with it in -tip, but it's
  got his Ack.

  This is similar to the timer_struct modernization from a while back,
  but not nearly as messy (I hope). :)

   - Prepare for tasklet API modernization (Romain Perier, Allen Pais,
     Kees Cook)"

* tag 'tasklets-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  tasklet: Introduce new initialization API
  treewide: Replace DECLARE_TASKLET() with DECLARE_TASKLET_OLD()
  usb: gadget: udc: Avoid tasklet passing a global
parents 5b5d3be5 12cc923f

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;



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
@@ -92,7 +92,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
@@ -46,7 +46,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE