[PATCH 1/2] hsi: nokia-modem: convert tasklets to use new tasklet_setup() API
From: Allen Pais <hidden>
Date: 2020-08-17 09:19:11
Also in:
dri-devel, intel-gfx, linux-arm-kernel, linux-block, linux-hyperv, linux-input, linux-mmc, linux-s390, linux-spi, linux-um, lkml
Subsystem:
hsi subsystem, the rest · Maintainers:
Sebastian Reichel, Linus Torvalds
From: Allen Pais <redacted> 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 <redacted> --- drivers/hsi/clients/nokia-modem.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/hsi/clients/nokia-modem.c b/drivers/hsi/clients/nokia-modem.c
index cd7ebf4c2e2f..36d373f089ce 100644
--- a/drivers/hsi/clients/nokia-modem.c
+++ b/drivers/hsi/clients/nokia-modem.c@@ -36,9 +36,10 @@ struct nokia_modem_device { struct hsi_client *cmt_speech; }; -static void do_nokia_modem_rst_ind_tasklet(unsigned long data) +static void do_nokia_modem_rst_ind_tasklet(struct tasklet_struct *t) { - struct nokia_modem_device *modem = (struct nokia_modem_device *)data; + struct nokia_modem_device *modem = from_tasklet(modem, t, + nokia_modem_rst_ind_tasklet); if (!modem) return;
@@ -155,8 +156,8 @@ static int nokia_modem_probe(struct device *dev) modem->nokia_modem_rst_ind_irq = irq; pflags = irq_get_trigger_type(irq); - tasklet_init(&modem->nokia_modem_rst_ind_tasklet, - do_nokia_modem_rst_ind_tasklet, (unsigned long)modem); + tasklet_setup(&modem->nokia_modem_rst_ind_tasklet, + do_nokia_modem_rst_ind_tasklet); err = devm_request_irq(dev, irq, nokia_modem_rst_ind_isr, pflags, "modem_rst_ind", modem); if (err < 0) {
--
2.17.1