From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Allen Pais Subject: [PATCH] firewire: ohci: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:46:05 +0530 Message-Id: <20200817091617.28119-11-allen.cryptic@gmail.com> In-Reply-To: <20200817091617.28119-1-allen.cryptic@gmail.com> References: <20200817091617.28119-1-allen.cryptic@gmail.com> Sender: linux-spi-owner@vger.kernel.org To: jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, 3chas3@gmail.com, axboe@kernel.dk, stefanr@s5r6.in-berlin.de, airlied@linux.ie, daniel@ffwll.ch, sre@kernel.org, James.Bottomley@HansenPartnership.com, kys@microsoft.com, deller@gmx.de, dmitry.torokhov@gmail.com, jassisinghbrar@gmail.com, shawnguo@kernel.org, s.hauer@pengutronix.de, maximlevitsky@gmail.com, oakad@yahoo.com, ulf.hansson@linaro.org, mporter@kernel.crashing.org, alex.bou9@gmail.com, broonie@kernel.org, martyn@welchs.me.uk, manohar.vanga@gmail.com, mitch@sfgoth.com, davem@davemloft.net, kuba@kernel.org Cc: keescook@chromium.org, linux-um@lists.infradead.org, linux-kernel@vger.kernel.org, linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org, linux-block@vger.kernel.org, linux-arm-kernel@lists.infradead.org, openipmi-developer@lists.sourceforge.net, linux1394-devel@lists.sourceforge.net, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-hyperv@vger.kernel.org, linux-parisc@vger.kernel.org, linux-input@vger.kernel.org, linux-mmc@vger.kernel.org, linux-ntb@googlegroups.com, linux-s390@vger.kernel.org, linux-spi@vger.kernel.org, devel@driverdev.osuosl.org, Allen Pais , Romain Perier List-ID: From: Allen Pais 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 Signed-off-by: Allen Pais --- drivers/firewire/ohci.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index 7dde21b18b04..6298ff03796e 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c @@ -921,9 +921,9 @@ static void ar_recycle_buffers(struct ar_context *ctx, unsigned int end_buffer) } } -static void ar_context_tasklet(unsigned long data) +static void ar_context_tasklet(struct tasklet_struct *t) { - struct ar_context *ctx = (struct ar_context *)data; + struct ar_context *ctx = from_tasklet(ctx, t, tasklet); unsigned int end_buffer_index, end_buffer_offset; void *p, *end; @@ -977,7 +977,7 @@ static int ar_context_init(struct ar_context *ctx, struct fw_ohci *ohci, ctx->regs = regs; ctx->ohci = ohci; - tasklet_init(&ctx->tasklet, ar_context_tasklet, (unsigned long)ctx); + tasklet_setup(&ctx->tasklet, ar_context_tasklet); for (i = 0; i < AR_BUFFERS; i++) { ctx->pages[i] = alloc_page(GFP_KERNEL | GFP_DMA32); @@ -1049,9 +1049,9 @@ static struct descriptor *find_branch_descriptor(struct descriptor *d, int z) return d + z - 1; } -static void context_tasklet(unsigned long data) +static void context_tasklet(struct tasklet_struct *t) { - struct context *ctx = (struct context *) data; + struct context *ctx = from_tasklet(ctx, t, tasklet); struct descriptor *d, *last; u32 address; int z; @@ -1145,7 +1145,7 @@ static int context_init(struct context *ctx, struct fw_ohci *ohci, ctx->buffer_tail = list_entry(ctx->buffer_list.next, struct descriptor_buffer, list); - tasklet_init(&ctx->tasklet, context_tasklet, (unsigned long)ctx); + tasklet_setup(&ctx->tasklet, context_tasklet); ctx->callback = callback; /* @@ -1420,7 +1420,7 @@ static void at_context_flush(struct context *ctx) tasklet_disable(&ctx->tasklet); ctx->flushing = true; - context_tasklet((unsigned long)ctx); + context_tasklet(&ctx->tasklet); ctx->flushing = false; tasklet_enable(&ctx->tasklet); @@ -3472,7 +3472,7 @@ static int ohci_flush_iso_completions(struct fw_iso_context *base) tasklet_disable(&ctx->context.tasklet); if (!test_and_set_bit_lock(0, &ctx->flushing_completions)) { - context_tasklet((unsigned long)&ctx->context); + context_tasklet(&ctx->context.tasklet); switch (base->type) { case FW_ISO_CONTEXT_TRANSMIT: -- 2.17.1