| From e43373c965ec60d7adda4e724a9175acd7aa2868 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 17 Aug 2020 14:32:06 +0530 |
| Subject: usb/gadget: f_midi: convert tasklets to use new tasklet_setup() API |
| |
| From: Allen Pais <allen.lkml@gmail.com> |
| |
| [ Upstream commit 6148c10f6b62a6df782d26522921f70cc8bf1d7f ] |
| |
| In preparation for unconditionally passing the |
| struct tasklet_struct pointer to all tasklet |
| callbacks, switch to using the new tasklet_setup() |
| and from_tasklet() to pass the tasklet pointer explicitly. |
| |
| Signed-off-by: Romain Perier <romain.perier@gmail.com> |
| Signed-off-by: Allen Pais <allen.lkml@gmail.com> |
| Link: https://lore.kernel.org/r/20200817090209.26351-5-allen.cryptic@gmail.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Stable-dep-of: 4ab37fcb4283 ("USB: gadget: f_midi: f_midi_complete to call queue_work") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/usb/gadget/function/f_midi.c | 6 +++--- |
| 1 file changed, 3 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/usb/gadget/function/f_midi.c b/drivers/usb/gadget/function/f_midi.c |
| index 54a09da8a7384..71aeaa2302edd 100644 |
| --- a/drivers/usb/gadget/function/f_midi.c |
| +++ b/drivers/usb/gadget/function/f_midi.c |
| @@ -698,9 +698,9 @@ static void f_midi_transmit(struct f_midi *midi) |
| f_midi_drop_out_substreams(midi); |
| } |
| |
| -static void f_midi_in_tasklet(unsigned long data) |
| +static void f_midi_in_tasklet(struct tasklet_struct *t) |
| { |
| - struct f_midi *midi = (struct f_midi *) data; |
| + struct f_midi *midi = from_tasklet(midi, t, tasklet); |
| f_midi_transmit(midi); |
| } |
| |
| @@ -875,7 +875,7 @@ static int f_midi_bind(struct usb_configuration *c, struct usb_function *f) |
| int status, n, jack = 1, i = 0, endpoint_descriptor_index = 0; |
| |
| midi->gadget = cdev->gadget; |
| - tasklet_init(&midi->tasklet, f_midi_in_tasklet, (unsigned long) midi); |
| + tasklet_setup(&midi->tasklet, f_midi_in_tasklet); |
| status = f_midi_register_card(midi); |
| if (status < 0) |
| goto fail_register; |
| -- |
| 2.39.5 |
| |
