From patchwork Mon Aug 17 08:31:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716957 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 43DB913A4 for ; Mon, 17 Aug 2020 08:32:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2C0F820758 for ; Mon, 17 Aug 2020 08:32:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TpOyiF8T" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727913AbgHQIcO (ORCPT ); Mon, 17 Aug 2020 04:32:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53644 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726422AbgHQIcK (ORCPT ); Mon, 17 Aug 2020 04:32:10 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 70CB2C061388; Mon, 17 Aug 2020 01:32:10 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id mw10so7353755pjb.2; Mon, 17 Aug 2020 01:32:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=xlkl/Kq20mWjBqJTahwsbMlG2dOEwdXmK5fJnd50gLo=; b=TpOyiF8TvePjfIaV2pPgdU00ho11Lxcuva4WlR3WztWdTLMM4V6K6Nz2t9o+th+orG yYcschRIWGDYRIPnwuycLeXIqFfanckm6A5NtGqgm+UGmxcb2LZFoINvYz1KUvuVG3s1 yKq2uHpNUHhben2hyR2x6xKvdFn2YCo437iS//033Y+3u/Itgwv36HbwGcmqyIKTJb8P i8e5tT+mSDiGOLjldRWCLFf6jLajq7nd5GCCJAeHJe0rWO3UJHh8grTjsJ9F48oaeYRO jQ8gSglyJhj4kOSFTYLKok9Qs+9pbO13Vvfhu/1f8remVThIhETPUBvYUYadmu15TCAe Chhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=xlkl/Kq20mWjBqJTahwsbMlG2dOEwdXmK5fJnd50gLo=; b=uI+vFjeHR/wHZHwh6qY8pM7v84AUw5eoQQbx4nB43pCfwNWR2pZU8hE3SDzhnQJRID /3xM35tk3EZ+tW+zAHXthLXm+qqcKsurDrAGErseYuFMPc+CShFhjj7N1iDlPYSFT5gh eR501lo96ou73Hv0ZVLK2WfKY4OLUzAaMFmJ5d0F6kciXO1E4UeEZb3ID/7vMqN1hfzm JX15eZoD36Dkj9NIIywqwnqZmxqTeRYgbaKEAzV+/I9czT51Nl9Bj9ubr/nyx3DmaeiR UeBMZz1dVM04wUe4NKo4ieX39Kocuzxg+LBVbToOq8/gEEkmVToBD3q3igMyQ0eCyrMe a6aQ== X-Gm-Message-State: AOAM532HI05vRMb/NRI6/TZM+RjHzdhjVPYXwOs6XanXhY9BB9ilXxXl zLpSNcptc8pb0LHa6xWU3vokqRn28dt79g== X-Google-Smtp-Source: ABdhPJyR59sYahFbk9ZfPfA3CZb6ggVyJy1/S2SaP59Z5blhEvuaKWVpCFeQsNG2OLVLUGvxzzji5g== X-Received: by 2002:a17:90b:124e:: with SMTP id gx14mr12038651pjb.225.1597653130105; Mon, 17 Aug 2020 01:32:10 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:09 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 01/11] media: bt8xx: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:43 +0530 Message-Id: <20200817083153.22218-2-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/pci/bt8xx/dvb-bt8xx.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/bt8xx/dvb-bt8xx.c b/drivers/media/pci/bt8xx/dvb-bt8xx.c index 02ebd43e672e..4cb890b949c3 100644 --- a/drivers/media/pci/bt8xx/dvb-bt8xx.c +++ b/drivers/media/pci/bt8xx/dvb-bt8xx.c @@ -39,9 +39,10 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); #define IF_FREQUENCYx6 217 /* 6 * 36.16666666667MHz */ -static void dvb_bt8xx_task(unsigned long data) +static void dvb_bt8xx_task(struct tasklet_struct *t) { - struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *)data; + struct bt878 *bt = from_tasklet(bt, t, tasklet); + struct dvb_bt8xx_card *card = dev_get_drvdata(&bt->adapter->dev); dprintk("%d\n", card->bt->finished_block); @@ -777,7 +778,7 @@ static int dvb_bt8xx_load_card(struct dvb_bt8xx_card *card, u32 type) goto err_disconnect_frontend; } - tasklet_init(&card->bt->tasklet, dvb_bt8xx_task, (unsigned long) card); + tasklet_setup(&card->bt->tasklet, dvb_bt8xx_task); frontend_init(card, type); From patchwork Mon Aug 17 08:31:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716959 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id CABE7109B for ; Mon, 17 Aug 2020 08:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B15EF207DF for ; Mon, 17 Aug 2020 08:32:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WgoiJu09" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727997AbgHQIcT (ORCPT ); Mon, 17 Aug 2020 04:32:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727945AbgHQIcO (ORCPT ); Mon, 17 Aug 2020 04:32:14 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40EE6C061388; Mon, 17 Aug 2020 01:32:14 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id kr4so7465150pjb.2; Mon, 17 Aug 2020 01:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=e3Og+eF42LgjnZGVUesfee3WTkmoUc4PC8c793SBuQU=; b=WgoiJu09z4J0Jj3XuHjmXRKp6QZJHcgPl1ICWv0c8Gp/4sOCo43HwNBDraeBOrRz2Z YZwz1TSpV78cMxbqMYqBgGkaxc+xCJwqzNNzgSRzuQe4MOeJlkA8ES3UprnEDKpR0prs 0kv1Y1kVCbmRB/L/cl64K1DpPrwzoSFnMUoTJGdktwTOuerqCzMAwEwUNcbm7hK1dbIj FNAYzYkQhshhFr1wSbDUQEj/BucIGRR/EyOJX5cz7RpRVRpp+Na7Kwevn3g2BucCTz0D wD1ixTL2MZmBs1BUCoEk0ZIw4QdiL5ZUSybxd7RujKFpkU4vQJp4oj8pR0jfNbmtrJ6u lI+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=e3Og+eF42LgjnZGVUesfee3WTkmoUc4PC8c793SBuQU=; b=VRAg+agrxU8+q2xg6ur5mVk3HXMqZ4JzIiz+FuFDBM36UIp4eyKFhiRX+mp6rFWwbF xSJsgrksz2JDX3n3WJ6i9pcPcb002GxpmOTLhFXRDa94pE4J1J9bDpzKLKDB7lE+c563 yENqWZJ0E4xugSwwFeXYbb/WHD7ZdZoYM4mJ9mBNNjbEMf6Y6rvtbkboNlgnNUJ1VTaa WLFQnWq5HrTM+h13r33flCvdQggkriH2odZDVpqGg4VLiGiJ+7uMR3wB+pt8rBuEZvpf i1o2dPJk54c7o9rKcDRiRmzp2h9T2EmVho+jjguXGweUsqDS919K17TIVyBho2Dq0gB7 0grw== X-Gm-Message-State: AOAM532qRG/XgsTYB2xNovv/H/64VUIyuafGVjFgc0V1WvvIEwDGks7w QGW9FC6ryrf8Ek2wxzQjPkE= X-Google-Smtp-Source: ABdhPJzUadOmIrNJaQ4WF7QKMawSbip+D07RLS2LQ9WloQtegJR1zfyW+4hAn2v9YtO/677c6Vz85w== X-Received: by 2002:a17:902:8f82:: with SMTP id z2mr8443888plo.177.1597653133845; Mon, 17 Aug 2020 01:32:13 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:13 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 02/11] media: mantis: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:44 +0530 Message-Id: <20200817083153.22218-3-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/pci/mantis/mantis_dma.c | 4 ++-- drivers/media/pci/mantis/mantis_dma.h | 2 +- drivers/media/pci/mantis/mantis_dvb.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/media/pci/mantis/mantis_dma.c b/drivers/media/pci/mantis/mantis_dma.c index affc5977387f..4df571ff272b 100644 --- a/drivers/media/pci/mantis/mantis_dma.c +++ b/drivers/media/pci/mantis/mantis_dma.c @@ -200,9 +200,9 @@ void mantis_dma_stop(struct mantis_pci *mantis) } -void mantis_dma_xfer(unsigned long data) +void mantis_dma_xfer(struct tasklet_struct *t) { - struct mantis_pci *mantis = (struct mantis_pci *) data; + struct mantis_pci *mantis = from_tasklet(mantis, t, tasklet); struct mantis_hwconfig *config = mantis->hwconfig; while (mantis->last_block != mantis->busy_block) { diff --git a/drivers/media/pci/mantis/mantis_dma.h b/drivers/media/pci/mantis/mantis_dma.h index 421663443d62..37da982c9c29 100644 --- a/drivers/media/pci/mantis/mantis_dma.h +++ b/drivers/media/pci/mantis/mantis_dma.h @@ -13,6 +13,6 @@ extern int mantis_dma_init(struct mantis_pci *mantis); extern int mantis_dma_exit(struct mantis_pci *mantis); extern void mantis_dma_start(struct mantis_pci *mantis); extern void mantis_dma_stop(struct mantis_pci *mantis); -extern void mantis_dma_xfer(unsigned long data); +extern void mantis_dma_xfer(struct tasklet_struct *t); #endif /* __MANTIS_DMA_H */ diff --git a/drivers/media/pci/mantis/mantis_dvb.c b/drivers/media/pci/mantis/mantis_dvb.c index 2da94be5b373..c7ba4a76e608 100644 --- a/drivers/media/pci/mantis/mantis_dvb.c +++ b/drivers/media/pci/mantis/mantis_dvb.c @@ -205,7 +205,7 @@ int mantis_dvb_init(struct mantis_pci *mantis) } dvb_net_init(&mantis->dvb_adapter, &mantis->dvbnet, &mantis->demux.dmx); - tasklet_init(&mantis->tasklet, mantis_dma_xfer, (unsigned long) mantis); + tasklet_setup(&mantis->tasklet, mantis_dma_xfer); tasklet_disable(&mantis->tasklet); if (mantis->hwconfig) { result = config->frontend_init(mantis, mantis->fe); From patchwork Mon Aug 17 08:31:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716961 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6FD4C13A4 for ; Mon, 17 Aug 2020 08:32:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56F47207FF for ; Mon, 17 Aug 2020 08:32:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Vh1O6hNK" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728081AbgHQIcY (ORCPT ); Mon, 17 Aug 2020 04:32:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726473AbgHQIcU (ORCPT ); Mon, 17 Aug 2020 04:32:20 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0620CC061388; Mon, 17 Aug 2020 01:32:20 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id h12so7767370pgm.7; Mon, 17 Aug 2020 01:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hOaPXxj1ai+YwAcly+36QLrMNRChjPUinTBacA1yTzQ=; b=Vh1O6hNKx5uPwEhSlycr3poiuspl4NNR8D+J1oJuoL0KyXyzdwAe5JZfWbyHIBfEKx aPcFQMXkBGwwYNGmq/yQc6WJIbMSDyKdG+MhBS7DK0ZAqVVTu88Q2ndym5JwGbUs6Sd0 cVmK7oa7fO65A7NZW/2IzEEr54WmzcZvHizXPp6G/l2wXldXQ1lwKaitli+OuUkV/eB1 GPTQLvNzfJ228xHRLv8W+Cu3yIpMjhEP/E62UD+j/pOOeLMyoiinH2K8BiISshPphEz3 W+KbBNWUZ2EimUulXYBahy2eH+XNbUQXhCoRHohGFkOubOkXRPFAZkzWjmHLLSpddxZb lKtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=hOaPXxj1ai+YwAcly+36QLrMNRChjPUinTBacA1yTzQ=; b=Vaw1ggPkHng7kB1ALzPBuciYlbNOYcomk6HAiA1REBvEtdomoJ36vRlAEbq56WBFNL CDvaffZfoSQb8xN1p7GXf1owSeBrEvlPlxY6PsqGlebDIXhpVsdB6VUXjl62RGR0v/Kz qPx8UKKMs/FovhKk/rRZfaGCSadlLXSeZKHLcHbVfa4LE0SroRkpBwjfheoFDq1w70bV tWds9IN9gfG1tK/bWZYN3ZFzq7ww14GwhzjsILsTRiAxkEeWtmvoM/xOBddmt5+01jBI T61OaOaLzS4etlWH3usNVQPrRRl51KO049OFLxYEyyVdgoNr+UtCxOTh1VgvWfLe7nI/ /xrg== X-Gm-Message-State: AOAM531Mh92ooG71Coqfm/EkgHXLKWYLRBgqXWvKtnTf48eSpdH634NQ JiB0FEbh1TM8ZYNSzf4MCoI= X-Google-Smtp-Source: ABdhPJwMX/GI66KPwY3Jsk4XWv9O89pOJfG5fNqvE+XbYqZ1Agv0nFBm6SbXx4Z8l4MD6znhJC7kmQ== X-Received: by 2002:aa7:9ec4:: with SMTP id r4mr10857380pfq.48.1597653139620; Mon, 17 Aug 2020 01:32:19 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:19 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 03/11] media: ngene: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:45 +0530 Message-Id: <20200817083153.22218-4-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/pci/ngene/ngene-core.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/pci/ngene/ngene-core.c b/drivers/media/pci/ngene/ngene-core.c index af15ca1c501b..f9f94f47d76b 100644 --- a/drivers/media/pci/ngene/ngene-core.c +++ b/drivers/media/pci/ngene/ngene-core.c @@ -50,9 +50,9 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr); /* nGene interrupt handler **************************************************/ /****************************************************************************/ -static void event_tasklet(unsigned long data) +static void event_tasklet(struct tasklet_struct *t) { - struct ngene *dev = (struct ngene *)data; + struct ngene *dev = from_tasklet(dev, t, event_tasklet); while (dev->EventQueueReadIndex != dev->EventQueueWriteIndex) { struct EVENT_BUFFER Event = @@ -68,9 +68,9 @@ static void event_tasklet(unsigned long data) } } -static void demux_tasklet(unsigned long data) +static void demux_tasklet(struct tasklet_struct *t) { - struct ngene_channel *chan = (struct ngene_channel *)data; + struct ngene_channel *chan = from_tasklet(chan, t, demux_tasklet); struct device *pdev = &chan->dev->pci_dev->dev; struct SBufferHeader *Cur = chan->nextBuffer; @@ -1181,7 +1181,7 @@ static void ngene_init(struct ngene *dev) struct device *pdev = &dev->pci_dev->dev; int i; - tasklet_init(&dev->event_tasklet, event_tasklet, (unsigned long)dev); + tasklet_setup(&dev->event_tasklet, event_tasklet); memset_io(dev->iomem + 0xc000, 0x00, 0x220); memset_io(dev->iomem + 0xc400, 0x00, 0x100); @@ -1445,7 +1445,7 @@ static int init_channel(struct ngene_channel *chan) struct ngene_info *ni = dev->card_info; int io = ni->io_type[nr]; - tasklet_init(&chan->demux_tasklet, demux_tasklet, (unsigned long)chan); + tasklet_setup(&chan->demux_tasklet, demux_tasklet); chan->users = 0; chan->type = io; chan->mode = chan->type; /* for now only one mode */ From patchwork Mon Aug 17 08:31:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716963 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 948AD13A4 for ; Mon, 17 Aug 2020 08:32:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7C7732072D for ; Mon, 17 Aug 2020 08:32:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="l7ws862q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728082AbgHQIcb (ORCPT ); Mon, 17 Aug 2020 04:32:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728077AbgHQIcY (ORCPT ); Mon, 17 Aug 2020 04:32:24 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E0CFC061388; Mon, 17 Aug 2020 01:32:24 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id o13so7791383pgf.0; Mon, 17 Aug 2020 01:32:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=07OcTn0WvfbdnvA4s7Eut/eKjTVLyM4q+0Qmy2LDm0U=; b=l7ws862qdf+QG/FRgRzM2zyRMT8buz3qjIIUIC911q8cLJC5Fr7zqyZ9VZdli+Y4CO mg02zvbTldmq+25rE+w6TL3nVPvfkF9Dsc6rBcmJ2PjPHZAvCYHfWytpyM/n4mrGCoY8 GYvfL+4pmdgrQD2EkIsKqmPzkDtq/mLjng08sY2/morHJ0/b2LgTwmp5BxkF9z4HvWfM Th3BZh/j01nqCWwKf/JvN0oEq5Mr5vfIKwiUsD+/WU46dmw1Q7UBfWnu1NCAlUCZw0uN 2JlQuG0h61ifPd4Wu1hHBKNUFSFQ9R+VIfWQz9U4TQIonljShIoAbbKnXjtNPL4an9aH D8BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=07OcTn0WvfbdnvA4s7Eut/eKjTVLyM4q+0Qmy2LDm0U=; b=ZcziOOUFP3inyjTYm2ljwcroAukqWolALrAt51dwS3S6lb74TzoamcM/a2z7YUN7bv 1FqWSZf7tCASxk/6qX2H4mbtp+33K3np/FYnQx31fwNYaQLcWuaFCEu/vXeIdTHTkzKF Vu4I7bftTkt2xwU5K4iyOjbMbSWjzU1b3dD5lFGI9X2WQk7/uKZppDt/df0ZAzSybIt3 hvnRFud1ChCuhKV45C5569mnlbkktOxKS+lU+cSgjPIGZTt4UafqxbYg8h50qlZivwr0 sQR1XiKsouGVf241EqJQWYgloGtV3J1VQ8kLFUVJeChaHw9wP2f0ZSigwbEYDkBE/tul s09w== X-Gm-Message-State: AOAM530HdCMFPk9QPFyKaIvFTNUxBd6JTjcY5LApNi0x/5UkMAnDtiQ8 AsQ99+gll6rpntuAt5sc+ZQ= X-Google-Smtp-Source: ABdhPJwwstyk15Z19/5BM2jWQthYwAlrQCLHl80YU15rdh8SHJRf4gdYA8ej4Z8R4dt9WWOsmps+Og== X-Received: by 2002:a62:1614:: with SMTP id 20mr10690453pfw.258.1597653144118; Mon, 17 Aug 2020 01:32:24 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:23 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 04/11] media: smipcie: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:46 +0530 Message-Id: <20200817083153.22218-5-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/pci/smipcie/smipcie-main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/pci/smipcie/smipcie-main.c b/drivers/media/pci/smipcie/smipcie-main.c index 9ca0fc3e6f80..e7604b7ecc8d 100644 --- a/drivers/media/pci/smipcie/smipcie-main.c +++ b/drivers/media/pci/smipcie/smipcie-main.c @@ -280,9 +280,9 @@ static void smi_port_clearInterrupt(struct smi_port *port) } /* tasklet handler: DMA data to dmx.*/ -static void smi_dma_xfer(unsigned long data) +static void smi_dma_xfer(struct tasklet_struct *t) { - struct smi_port *port = (struct smi_port *) data; + struct smi_port *port = from_tasklet(port, t, tasklet); struct smi_dev *dev = port->dev; u32 intr_status, finishedData, dmaManagement; u8 dmaChan0State, dmaChan1State; @@ -422,7 +422,7 @@ static int smi_port_init(struct smi_port *port, int dmaChanUsed) } smi_port_disableInterrupt(port); - tasklet_init(&port->tasklet, smi_dma_xfer, (unsigned long)port); + tasklet_setup(&port->tasklet, smi_dma_xfer); tasklet_disable(&port->tasklet); port->enable = 1; return 0; From patchwork Mon Aug 17 08:31:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716981 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D894513A4 for ; Mon, 17 Aug 2020 08:33:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB144207DF for ; Mon, 17 Aug 2020 08:33:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="G+OGmYQU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726772AbgHQIdY (ORCPT ); Mon, 17 Aug 2020 04:33:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53698 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727027AbgHQIc2 (ORCPT ); Mon, 17 Aug 2020 04:32:28 -0400 Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 695D2C061388; Mon, 17 Aug 2020 01:32:28 -0700 (PDT) Received: by mail-pf1-x442.google.com with SMTP id 17so7874069pfw.9; Mon, 17 Aug 2020 01:32:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=OgN4FVVdP+EhF1ujYvTAQgNw3tvzSDcv5PzN1nKoLuc=; b=G+OGmYQUjJZaSBW599D9vY0hPs94/Lop1UOM2gXnC5C5A9cCtXpjONVn1i+sitqopr C6QFvCQrDDlfGGbeKehlkkR8D8AigWvjD11BLEGjbnQJARgwwbhhh0dBL+m9XAWSNvGG ru2idW+bSSWAfidBKho1MHJPLwjgis1BdFrFmbFv1/1IPW3r4C42XMZ9QgWDJmP+LD5C BTOX58DZl3IpHyiXg78Mrs2shPellbY9nb9FuFnJdx13sseRH8H07V0ad7hqZDpiaOZh 0522u31TrE/vN+Fo8X3VIEhYe/34+8euK34fC+iPOdZsum5qDKZ9c4PaEhI87kd5yOgt kCZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=OgN4FVVdP+EhF1ujYvTAQgNw3tvzSDcv5PzN1nKoLuc=; b=f4ABF+HRVP73cqttRGtl4kF4hWyyoOsplIbdoL4Was1b9ZG6Y+YfE9b5Gjq87IocEJ HvD82u3ZYVXacbUCHR0fm1GbMHTe/PIFqRBSTS67Le81YlcYXKPmDa4z7EhXlDXsj5aS FF/9cuuAjAUkFz77EhZ1+ezhbm8T8CuNkMJEUcz5PnulNKoR8yyeq9L+WrADLcTr0qJ7 ovn5w9hM4ZGSHh6vFjxhk5KdWFKSr62KLbGs7NQFiCazRgcx1SsXEmFWUzm9X2pEsbq6 cfOcW/xCngUAAw6tFldC8rTqZGYg8CPuSw5N8NzoVnpckwCQByxz8XKIX19hfKEji8Fa HVVA== X-Gm-Message-State: AOAM533Ml1TRF36b2JcpsMopRpQdBTN5OJUK+w/UytSKE41lkQXDT70I BarXg/mMWYKoMNcbst3QIXE= X-Google-Smtp-Source: ABdhPJwwfZ0fHwlnBF6kQnAMSh56m3wQvU5v1Vuu1X+2GqVpq3FIn/BLzSHwu7Xxc2LDektsBe2c4Q== X-Received: by 2002:a63:161a:: with SMTP id w26mr2718287pgl.211.1597653147908; Mon, 17 Aug 2020 01:32:27 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:27 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 05/11] media: ttpci: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:47 +0530 Message-Id: <20200817083153.22218-6-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/pci/ttpci/av7110.c | 20 ++++++++++---------- drivers/media/pci/ttpci/budget-ci.c | 15 ++++++++------- drivers/media/pci/ttpci/budget-core.c | 6 +++--- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/drivers/media/pci/ttpci/av7110.c b/drivers/media/pci/ttpci/av7110.c index bf36b1e22b63..885e6bc40c19 100644 --- a/drivers/media/pci/ttpci/av7110.c +++ b/drivers/media/pci/ttpci/av7110.c @@ -357,9 +357,9 @@ static inline void start_debi_dma(struct av7110 *av7110, int dir, irdebi(av7110, DEBISWAB, addr, 0, len); } -static void debiirq(unsigned long cookie) +static void debiirq(struct tasklet_struct *t) { - struct av7110 *av7110 = (struct av7110 *)cookie; + struct av7110 *av7110 = from_tasklet(av7110, t, debi_tasklet); int type = av7110->debitype; int handle = (type >> 8) & 0x1f; unsigned int xfer = 0; @@ -458,9 +458,9 @@ static void debiirq(unsigned long cookie) } /* irq from av7110 firmware writing the mailbox register in the DPRAM */ -static void gpioirq(unsigned long cookie) +static void gpioirq(struct tasklet_struct *t) { - struct av7110 *av7110 = (struct av7110 *)cookie; + struct av7110 *av7110 = from_tasklet(av7110, t, gpio_tasklet); u32 rxbuf, txbuf; int len; @@ -1230,9 +1230,9 @@ static int budget_stop_feed(struct dvb_demux_feed *feed) return status; } -static void vpeirq(unsigned long cookie) +static void vpeirq(struct tasklet_struct *t) { - struct av7110 *budget = (struct av7110 *)cookie; + struct av7110 *budget = from_tasklet(budget, t, vpe_tasklet); u8 *mem = (u8 *) (budget->grabbing); u32 olddma = budget->ttbp; u32 newdma = saa7146_read(budget->dev, PCI_VDP3); @@ -2518,7 +2518,7 @@ static int av7110_attach(struct saa7146_dev* dev, saa7146_write(dev, NUM_LINE_BYTE3, (TS_HEIGHT << 16) | TS_WIDTH); saa7146_write(dev, MC2, MASK_04 | MASK_20); - tasklet_init(&av7110->vpe_tasklet, vpeirq, (unsigned long) av7110); + tasklet_setup(&av7110->vpe_tasklet, vpeirq); } else if (budgetpatch) { spin_lock_init(&av7110->feedlock1); @@ -2599,7 +2599,7 @@ static int av7110_attach(struct saa7146_dev* dev, saa7146_write(dev, MC1, (MASK_13 | MASK_29)); /* end of budgetpatch register initialization */ - tasklet_init (&av7110->vpe_tasklet, vpeirq, (unsigned long) av7110); + tasklet_setup(&av7110->vpe_tasklet, vpeirq); } else { saa7146_write(dev, PCI_BT_V1, 0x1c00101f); saa7146_write(dev, BCS_CTRL, 0x80400040); @@ -2614,8 +2614,8 @@ static int av7110_attach(struct saa7146_dev* dev, saa7146_write(dev, GPIO_CTRL, 0x000000); } - tasklet_init (&av7110->debi_tasklet, debiirq, (unsigned long) av7110); - tasklet_init (&av7110->gpio_tasklet, gpioirq, (unsigned long) av7110); + tasklet_setup(&av7110->debi_tasklet, debiirq); + tasklet_setup(&av7110->gpio_tasklet, gpioirq); mutex_init(&av7110->pid_mutex); diff --git a/drivers/media/pci/ttpci/budget-ci.c b/drivers/media/pci/ttpci/budget-ci.c index 77b102b8a013..d59d18647371 100644 --- a/drivers/media/pci/ttpci/budget-ci.c +++ b/drivers/media/pci/ttpci/budget-ci.c @@ -99,9 +99,10 @@ struct budget_ci { u8 tuner_pll_address; /* used for philips_tdm1316l configs */ }; -static void msp430_ir_interrupt(unsigned long data) +static void msp430_ir_interrupt(struct tasklet_struct *t) { - struct budget_ci *budget_ci = (struct budget_ci *) data; + struct budget_ci_ir *ir = from_tasklet(ir, t, msp430_irq_tasklet); + struct budget_ci *budget_ci = container_of(ir, typeof(*budget_ci), ir); struct rc_dev *dev = budget_ci->ir.dev; u32 command = ttpci_budget_debiread(&budget_ci->budget, DEBINOSWAP, DEBIADDR_IR, 2, 1, 0) >> 8; @@ -229,8 +230,7 @@ static int msp430_ir_init(struct budget_ci *budget_ci) budget_ci->ir.dev = dev; - tasklet_init(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt, - (unsigned long) budget_ci); + tasklet_setup(&budget_ci->ir.msp430_irq_tasklet, msp430_ir_interrupt); SAA7146_IER_ENABLE(saa, MASK_06); saa7146_setgpio(saa, 3, SAA7146_GPIO_IRQHI); @@ -348,9 +348,10 @@ static int ciintf_slot_ts_enable(struct dvb_ca_en50221 *ca, int slot) return 0; } -static void ciintf_interrupt(unsigned long data) +static void ciintf_interrupt(struct tasklet_struct *t) { - struct budget_ci *budget_ci = (struct budget_ci *) data; + struct budget_ci *budget_ci = from_tasklet(budget_ci, t, + ciintf_irq_tasklet); struct saa7146_dev *saa = budget_ci->budget.dev; unsigned int flags; @@ -491,7 +492,7 @@ static int ciintf_init(struct budget_ci *budget_ci) // Setup CI slot IRQ if (budget_ci->ci_irq) { - tasklet_init(&budget_ci->ciintf_irq_tasklet, ciintf_interrupt, (unsigned long) budget_ci); + tasklet_setup(&budget_ci->ciintf_irq_tasklet, ciintf_interrupt); if (budget_ci->slot_status != SLOTSTATUS_NONE) { saa7146_setgpio(saa, 0, SAA7146_GPIO_IRQLO); } else { diff --git a/drivers/media/pci/ttpci/budget-core.c b/drivers/media/pci/ttpci/budget-core.c index 293867b9e796..d405eea5c37f 100644 --- a/drivers/media/pci/ttpci/budget-core.c +++ b/drivers/media/pci/ttpci/budget-core.c @@ -171,9 +171,9 @@ static int budget_read_fe_status(struct dvb_frontend *fe, return ret; } -static void vpeirq(unsigned long data) +static void vpeirq(struct tasklet_struct *t) { - struct budget *budget = (struct budget *) data; + struct budget *budget = from_tasklet(budget, t, vpe_tasklet); u8 *mem = (u8 *) (budget->grabbing); u32 olddma = budget->ttbp; u32 newdma = saa7146_read(budget->dev, PCI_VDP3); @@ -519,7 +519,7 @@ int ttpci_budget_init(struct budget *budget, struct saa7146_dev *dev, /* upload all */ saa7146_write(dev, GPIO_CTRL, 0x000000); - tasklet_init(&budget->vpe_tasklet, vpeirq, (unsigned long) budget); + tasklet_setup(&budget->vpe_tasklet, vpeirq); /* frontend power on */ if (bi->type != BUDGET_FS_ACTIVY) From patchwork Mon Aug 17 08:31:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716969 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B8034109B for ; Mon, 17 Aug 2020 08:32:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E96E2072D for ; Mon, 17 Aug 2020 08:32:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WRLKS+MM" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728239AbgHQIcp (ORCPT ); Mon, 17 Aug 2020 04:32:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728143AbgHQIcd (ORCPT ); Mon, 17 Aug 2020 04:32:33 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DE91C061389; Mon, 17 Aug 2020 01:32:32 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id y10so5582290plr.11; Mon, 17 Aug 2020 01:32:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Ahy70Yk2bRVB7QBIejUmD1G9Y2W/MzcgwHjWYQelH0I=; b=WRLKS+MMnDOkRIFbCcdWRCCHhHc4NwPn/uvQL8gU6YF85p2FTJdK8xTGsE7T6dsj3U M5m5R7c22PVaRHYYlJrTCNAVVSA9Ry9vsR9LR/18XxF4S3771cEBSmJRDHFCFuI4jQ9m RwzaQWZb16vkJmf6I6rRBVfBehuKZp4pKepBsJttncXoKZr21hfqlHPKLANXMoFkBnC4 diwKPpcz6XxHWurdG2aD+q4V1SIH0iV7TZFvaqP8SlRphmAZiVHGyF0ykisJe5lBCaG5 b+BjELiv1yH0kF6J38RYp5CXxrp/u/PDEfKbkqURS8m2aBrU6fFcwy3yc+7eW5icEApv nC2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Ahy70Yk2bRVB7QBIejUmD1G9Y2W/MzcgwHjWYQelH0I=; b=LCDQuMyDEHjwcj+Zjudk69KKqSd/9HgEY0tDlZOaN3+iOJdtNldptPVcEzlanKWAam hJ+f5XZeg4O+4PJCPySQdA0TxDNVC2TkUEIn+HNAgGDCxnrHAqJ4LBhnXXTF06QfRbtM +Lg3A4sX3zCWdhebiWZhFoe9o5HTDx9lrnx4aQztN80NpFXJMNl56SqcJrIq7FHmIlK4 ZkP/urR81CYyewOhs+PZHAVd/vfinrvv2TVA4495yoPs8oR4VFIuOJts2ZuRyNR3Nj1+ dSroE3K5KNEkvscUNXjj1hpLfiIBaYEU8Y1KWwCqipfXCLLaOb4S195Us+uxBwSzXjNL bI6g== X-Gm-Message-State: AOAM531yMs1fGuYbcfSqGWBplOIC/aB7fgagRWzfW212ML75d/L/VC2C MkyH/PtHTi3TAQG++tWpcJI= X-Google-Smtp-Source: ABdhPJwF+cEnYujAMr0ykZx6WmkvBbF37TVTpNJT6zlrJJGif2tX3AG7dRZY1glR0Xvx5drCCwEEsw== X-Received: by 2002:a17:90a:88:: with SMTP id a8mr11612469pja.196.1597653152014; Mon, 17 Aug 2020 01:32:32 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:31 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 06/11] media: tw5864: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:48 +0530 Message-Id: <20200817083153.22218-7-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/pci/tw5864/tw5864-video.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/media/pci/tw5864/tw5864-video.c b/drivers/media/pci/tw5864/tw5864-video.c index ec1e06da7e4f..e232c6535a0a 100644 --- a/drivers/media/pci/tw5864/tw5864-video.c +++ b/drivers/media/pci/tw5864/tw5864-video.c @@ -175,7 +175,7 @@ static const unsigned int intra4x4_lambda3[] = { static v4l2_std_id tw5864_get_v4l2_std(enum tw5864_vid_std std); static enum tw5864_vid_std tw5864_from_v4l2_std(v4l2_std_id v4l2_std); -static void tw5864_handle_frame_task(unsigned long data); +static void tw5864_handle_frame_task(struct tasklet_struct *t); static void tw5864_handle_frame(struct tw5864_h264_frame *frame); static void tw5864_frame_interval_set(struct tw5864_input *input); @@ -1057,8 +1057,7 @@ int tw5864_video_init(struct tw5864_dev *dev, int *video_nr) dev->irqmask |= TW5864_INTR_VLC_DONE | TW5864_INTR_TIMER; tw5864_irqmask_apply(dev); - tasklet_init(&dev->tasklet, tw5864_handle_frame_task, - (unsigned long)dev); + tasklet_setup(&dev->tasklet, tw5864_handle_frame_task); for (i = 0; i < TW5864_INPUTS; i++) { dev->inputs[i].root = dev; @@ -1313,9 +1312,9 @@ static int tw5864_is_motion_triggered(struct tw5864_h264_frame *frame) return detected; } -static void tw5864_handle_frame_task(unsigned long data) +static void tw5864_handle_frame_task(struct tasklet_struct *t) { - struct tw5864_dev *dev = (struct tw5864_dev *)data; + struct tw5864_dev *dev = from_tasklet(dev, t, tasklet); unsigned long flags; int batch_size = H264_BUF_CNT; From patchwork Mon Aug 17 08:31:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716967 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1450813A4 for ; Mon, 17 Aug 2020 08:32:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E6F862072D for ; Mon, 17 Aug 2020 08:32:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Gh+EGB+k" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728134AbgHQIco (ORCPT ); Mon, 17 Aug 2020 04:32:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53722 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728177AbgHQIcg (ORCPT ); Mon, 17 Aug 2020 04:32:36 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C636C061388; Mon, 17 Aug 2020 01:32:36 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id k13so7128856plk.13; Mon, 17 Aug 2020 01:32:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NqEhz7gjYdgryeSdNN20GePxbntGjPIIXSk67vgjhoU=; b=Gh+EGB+k8MzIKZg3w4K1ReMB81hsNs2AGPTnCES/QCxxcuy4qM7/sBQrJNQ1rZHuzq 8czJSF/odgqsMdRQ6yGzY1iPtKRcg2YWPqLMvSmk1ini9g1Y5ggfMX2Yq9gxO0rCL1XW pc+g+KGPFngjL/wT8JdwBlwS/0t9kq4tDuTDu/3cRdiWucfvW9ot2zpxMGuHoXypTVHf GzcWtlRMRpUXDGWlrIHAj7LJ/JZqzSlEQKL2Weq16sJD8FIiGwErWBPUdWUEEAECmHmX IsubQ+XrnAe/To191WyUFC1zxUwNK1vw+zkEBGQc8CtOGz9x/a6LU+QrgCSp1mtmLuEc EXPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NqEhz7gjYdgryeSdNN20GePxbntGjPIIXSk67vgjhoU=; b=AhcG0oB5iQP1Fl+rPSeb2m+ekZZ/YgBYqfStVxwr9kSW//O5EPpX8SfFNUzJGX90SD 7yKYUendP/sSixVK/UHGWLaHv7cw4KvSgACr2q1nrZJ14bF8P+j3uX2pS4Da5ElAQ+UE l/w7zmsiuLkKiQGGT2+MXdxXsc3y0MR6a0icdu8u3s0/h41d0BZ0Io56ycnOAGnKAk53 +Vqq/+ov9KvXDhla2cHUkxzpAGR+g6GZ8ooY2XVZQTQcQxGTod9r9APZvyH6QPXfZ9+v cpm0MYogwoPaetL4dmzGGs9ZKysldPozMktXDuCApiESJavRAbOOQlBW6S5YVYrpj0LQ coVQ== X-Gm-Message-State: AOAM5305uQQGA6xDV0GDYRaNyx75ItlRXBdxLObdAuPkqyJinVgqVpLH 59GqWxFKqJhoCgyQpoQhmMc= X-Google-Smtp-Source: ABdhPJyaxIojnOBxSDHaqmulSYl6Xyx5DXhb37mfDSkclxjTW0DvKjhIzVP6JCoCGtu8211RqApIaA== X-Received: by 2002:a17:90b:3008:: with SMTP id hg8mr11716483pjb.120.1597653155825; Mon, 17 Aug 2020 01:32:35 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:35 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 07/11] media: marvell-ccic: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:49 +0530 Message-Id: <20200817083153.22218-8-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/platform/marvell-ccic/mcam-core.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c index 3d4242b8182b..7c4e3498d6bb 100644 --- a/drivers/media/platform/marvell-ccic/mcam-core.c +++ b/drivers/media/platform/marvell-ccic/mcam-core.c @@ -438,9 +438,9 @@ static void mcam_ctlr_dma_vmalloc(struct mcam_camera *cam) /* * Copy data out to user space in the vmalloc case */ -static void mcam_frame_tasklet(unsigned long data) +static void mcam_frame_tasklet(struct tasklet_struct *t) { - struct mcam_camera *cam = (struct mcam_camera *) data; + struct mcam_camera *cam = from_tasklet(cam, t, s_tasklet); int i; unsigned long flags; struct mcam_vb_buffer *buf; @@ -1323,8 +1323,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam) break; case B_vmalloc: #ifdef MCAM_MODE_VMALLOC - tasklet_init(&cam->s_tasklet, mcam_frame_tasklet, - (unsigned long) cam); + tasklet_setup(&cam->s_tasklet, mcam_frame_tasklet); vq->ops = &mcam_vb2_ops; vq->mem_ops = &vb2_vmalloc_memops; cam->dma_setup = mcam_ctlr_dma_vmalloc; From patchwork Mon Aug 17 08:31:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716977 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0FC3913A4 for ; Mon, 17 Aug 2020 08:33:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EAA4A20758 for ; Mon, 17 Aug 2020 08:33:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XiM7kKQG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728424AbgHQIdH (ORCPT ); Mon, 17 Aug 2020 04:33:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53734 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727797AbgHQIck (ORCPT ); Mon, 17 Aug 2020 04:32:40 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F064EC061389; Mon, 17 Aug 2020 01:32:39 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id mw10so7354335pjb.2; Mon, 17 Aug 2020 01:32:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=evlrKxSaL3VCX/rnaXC9Z1AuYwNMsmnef16/xHaNLkY=; b=XiM7kKQGvEDYEWbFL/Mq6Q9BGZdpAV8zIYWA4SZCu/QG1NxDaNrBk+gmwsZaimHx/W whR3YKb0mb2/haPbA+IoLIa9yQO4eyhUzXOnK+Npfc9HuAsa92i/PnTDsqmzly5AGnsH BYQLYQaZeNtcs3F2w+lt0koPEC1pQdx4mdX29hvhR+wWTiP0aocJFGfV18le4P+T00OT RiMpFeOg+nb5yziknywMjFVgGDyXtyG+oq40twQbO7UdmfjwuTea7oS4yy/IOR4AZFGp EL9Cbh+0woowtm+3epEs6iz32Qr27p6YNa1JlVBwJaFncBzCbbgOigL757gfKKntvGlr Xb7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=evlrKxSaL3VCX/rnaXC9Z1AuYwNMsmnef16/xHaNLkY=; b=OJ6q3DVJMtOF/zVB9rA7QAHttYW1v5ZlO3/MK5j0Ptoe0bzwhR67r6i/Z3hcNmIZsY 1ctYb7vYwRh3qlvaAIidgz41t+mY26xpBCmOQpSSNvlHhaFQAMiTUa7VsYaqja50fDoy FlxtkAil09+vYOpDY18BBajBUNw+Zrv4dszhHzNMjhIxSR5uBK6VCKfkmdLsq7tpntSP PrEn/KEu4Zu09EyjLMqa6FegWmvgGUxZ1U/0eXsQ4B4JKD5Ih/l4wCBiAQDdD7/mdPoM N0KSruz0FHHhW16KgFtKp2EIX8G6itnfi/p1wHoyGr5JT3fbIHl8NlToUZ+iXWnpAxyr d2aQ== X-Gm-Message-State: AOAM532SiduMrsat99lHXw2Qc043Bqhrf+QzxSwF9rGSy5Khsizd37kA 4ZEQCYGX1OxrDQZUAwxHVkzt+e3fPpu1wQ== X-Google-Smtp-Source: ABdhPJz4PEYfP1FEGnR3KB0zo1YmJDTwWrbYngPxGyBv1e4zvnZP+Kyse9nY2LYHZr7Y/7TGqcSIlw== X-Received: by 2002:a17:90a:db87:: with SMTP id h7mr12083211pjv.51.1597653159607; Mon, 17 Aug 2020 01:32:39 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:39 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 08/11] media: pxa_camera: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:50 +0530 Message-Id: <20200817083153.22218-9-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/platform/pxa_camera.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/platform/pxa_camera.c b/drivers/media/platform/pxa_camera.c index 6dce33f35041..ae317a900ce6 100644 --- a/drivers/media/platform/pxa_camera.c +++ b/drivers/media/platform/pxa_camera.c @@ -1186,9 +1186,9 @@ static void pxa_camera_deactivate(struct pxa_camera_dev *pcdev) clk_disable_unprepare(pcdev->clk); } -static void pxa_camera_eof(unsigned long arg) +static void pxa_camera_eof(struct tasklet_struct *t) { - struct pxa_camera_dev *pcdev = (struct pxa_camera_dev *)arg; + struct pxa_camera_dev *pcdev = from_tasklet(pcdev, t, task_eof); unsigned long cifr; struct pxa_buffer *buf; @@ -2478,7 +2478,7 @@ static int pxa_camera_probe(struct platform_device *pdev) goto exit_free_dma; } - tasklet_init(&pcdev->task_eof, pxa_camera_eof, (unsigned long)pcdev); + tasklet_setup(&pcdev->task_eof, pxa_camera_eof); pxa_camera_activate(pcdev); From patchwork Mon Aug 17 08:31:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716975 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 71FBB109B for ; Mon, 17 Aug 2020 08:33:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53B71207DF for ; Mon, 17 Aug 2020 08:33:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="M3HikLYs" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728391AbgHQIdG (ORCPT ); Mon, 17 Aug 2020 04:33:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728180AbgHQIco (ORCPT ); Mon, 17 Aug 2020 04:32:44 -0400 Received: from mail-pl1-x641.google.com (mail-pl1-x641.google.com [IPv6:2607:f8b0:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4093C061388; Mon, 17 Aug 2020 01:32:43 -0700 (PDT) Received: by mail-pl1-x641.google.com with SMTP id k13so7128982plk.13; Mon, 17 Aug 2020 01:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r6iEsvCYaHsibJa9rpmWya82cHXN/+L9JRpqk2jnfA8=; b=M3HikLYsY5jZ820rwnMInNQ4KMjMxkVS2VwmimZ5k9tBdXq1PGYd5213wHMPknYxdL jh2+DZbePnzWScl6nzFOb77CmhXiSMKWfMKASdvqtVYkqfRyQwPqz5/1o5inqZBZ8dFc 1elGGFVMwBbZ+8dsftxe/r1fXNkemRcbN6USdSMxf0STVF69yJBqt71UxYiSeT5Wgr6o kjH1YMd2hhG2coQOO8qjnjmPdgbT206dxO7lUDkX1RFCcoJsxsRX4//p4E6WYHDnLNbM ZBCUSThiou01I/6hXoXUvvvRh9nfslyyQvd6OqNn2qXBW3N5mTcsAHlRzVPp4+MgJzwP TOsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=r6iEsvCYaHsibJa9rpmWya82cHXN/+L9JRpqk2jnfA8=; b=NJb1xEScxmihdPBBO2r1SaNgbaBAPYHocRMpZq2Aj+rTXymXXncoWV5c00qkStEVui KTIeRWpoz34AydAgrvN5ykupziI89G66chbGCSSSU5tWr9wiEiRK6mZzOPVkveZYJ92+ E+68ghEJcfJk+JFDqU0/PK0V2yt7E7RnuaFHQrQJwHZ2MXIVu3LE6X7jY3yCBptHAwZm szZubxOlW5/enOsvx5682eOlUwg93mJ08cfoyJ1ut9B9goPGd3ucyy9xhEcOJLDTM5xo 1OdN/9WKO84IvN4z/g53JwjlbIzJqmnYKmsP3UxQHGvYuvsrgWwm4X0NVz5p9hSP6r51 etvQ== X-Gm-Message-State: AOAM5324L3zBz3GmOBNXq89koywDLo6dwPf0/CHHKb4U4i2pdcrktf5v AgYFAEaqhmE8yU8trEdJ41B7ujJi76d/Mw== X-Google-Smtp-Source: ABdhPJz72RyY25jDKMUxgEvYPHXwNJTcXnrhDfbusclY4Wta6QY/XQq8hlumZ+cC/qRzKrUqTIONBA== X-Received: by 2002:a17:90a:e511:: with SMTP id t17mr11596987pjy.189.1597653163410; Mon, 17 Aug 2020 01:32:43 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:42 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 09/11] media: sti: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:51 +0530 Message-Id: <20200817083153.22218-10-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/platform/sti/c8sectpfe/c8sectpfe-core.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c index 5baada4f65e5..dbe7788083a4 100644 --- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c @@ -77,9 +77,9 @@ static void c8sectpfe_timer_interrupt(struct timer_list *t) add_timer(&fei->timer); } -static void channel_swdemux_tsklet(unsigned long data) +static void channel_swdemux_tsklet(struct tasklet_struct *t) { - struct channel_info *channel = (struct channel_info *)data; + struct channel_info *channel = from_tasklet(channel, t, tsklet); struct c8sectpfei *fei; unsigned long wp, rp; int pos, num_packets, n, size; @@ -208,8 +208,7 @@ static int c8sectpfe_start_feed(struct dvb_demux_feed *dvbdmxfeed) dev_dbg(fei->dev, "Starting channel=%p\n", channel); - tasklet_init(&channel->tsklet, channel_swdemux_tsklet, - (unsigned long) channel); + tasklet_setup(&channel->tsklet, channel_swdemux_tsklet); /* Reset the internal inputblock sram pointers */ writel(channel->fifo, @@ -638,8 +637,7 @@ static int configure_memdma_and_inputblock(struct c8sectpfei *fei, writel(tsin->back_buffer_busaddr, tsin->irec + DMA_PRDS_BUSRP_TP(0)); /* initialize tasklet */ - tasklet_init(&tsin->tsklet, channel_swdemux_tsklet, - (unsigned long) tsin); + tasklet_setup(&tsin->tsklet, channel_swdemux_tsklet); return 0; From patchwork Mon Aug 17 08:31:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716973 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1AB7113A4 for ; Mon, 17 Aug 2020 08:32:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 01522207DF for ; Mon, 17 Aug 2020 08:32:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="d+VGCUsp" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728162AbgHQIcv (ORCPT ); Mon, 17 Aug 2020 04:32:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728271AbgHQIcr (ORCPT ); Mon, 17 Aug 2020 04:32:47 -0400 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7DC7EC061389; Mon, 17 Aug 2020 01:32:47 -0700 (PDT) Received: by mail-pg1-x544.google.com with SMTP id 128so7772677pgd.5; Mon, 17 Aug 2020 01:32:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=jjvDDq/8L15Sv7VUgqoIMZQVb7xUNFz5WyPYgZ5irWo=; b=d+VGCUspw14qYJuXoZkofwmewEPLwDoqAhfQWhxRAiRzuc4CC5op9Jo8Pk21mbzXrr 1uN0G6TbIBH/sUQRwlZ+wg2iYL1iXUn784j8XL0V7yzj/Mhr993koq+QW72sAQ2tD8e8 dFbKzTrY5Ge1rn9Mjz8MJq7F6rROW7bj8YEBdEezlDX58Qx10GX9BLMqw4uj2A3K8KyJ A9lc7iv1QMOOBs9iZp4atM50JObFBIgAQuM3gLsCap55F4OeXql4cXbjolMZqqhoTq1W /sTx7ipxPKLAhoGw8FWtiDtYW0SC7z/xzz6c3m9R2vq9nWfhKoyioMAZ68CU04IeJ8t0 6ZmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=jjvDDq/8L15Sv7VUgqoIMZQVb7xUNFz5WyPYgZ5irWo=; b=CoylhD8iEISUUmSd1lSX7T2NFlyWNk5sTlBVrpCWIkCpY6ruuqnT7aIzwUJVzgZE2S oSyQvdeJXXKVVnk94rgQ8wbLjHpwzXuXwhDtM0ntHmteDLTtV0E6i9NpS2D1j7lYFggE TShSmskioThVCBKd/xyAkQkYaxD4RZMRyhim2NIer/cmQk+jsR/CjD55ZKZncxQut1nD bOmkNHyvjervUr9ESth7zn2lalY1oJHO44QzjnPw3y1djAznloFLD4t98FuRL42xozg/ 6IFqoxCC+yaW5KnM7XEixGFbrv7TwBLGcYMlTXibYGflMZoaqnpbTeliYLRqkUQ1t2US Dk7Q== X-Gm-Message-State: AOAM530s3z1+C1A/sx/cH5nThwJ+My1qrZQINZluB9Yy9Zlno6uKirew JKmfxmxCaopmrBpxGVUgBvk= X-Google-Smtp-Source: ABdhPJyTu4zxbEbd5s2N3jMG1TWfoMJhqkj4QdJNVr58XHa/J2AnOn05SJcGSqAWcG9POyc7s9+u9A== X-Received: by 2002:a62:6887:: with SMTP id d129mr10726892pfc.279.1597653166944; Mon, 17 Aug 2020 01:32:46 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:46 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 10/11] media/radio: wl128x: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:52 +0530 Message-Id: <20200817083153.22218-11-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/radio/wl128x/fmdrv_common.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c index cce97c9d5409..5c395da74e17 100644 --- a/drivers/media/radio/wl128x/fmdrv_common.c +++ b/drivers/media/radio/wl128x/fmdrv_common.c @@ -244,7 +244,7 @@ void fmc_update_region_info(struct fmdev *fmdev, u8 region_to_set) * FM common sub-module will schedule this tasklet whenever it receives * FM packet from ST driver. */ -static void recv_tasklet(unsigned long arg) +static void recv_tasklet(struct tasklet_struct *t) { struct fmdev *fmdev; struct fm_irq *irq_info; @@ -253,7 +253,7 @@ static void recv_tasklet(unsigned long arg) u8 num_fm_hci_cmds; unsigned long flags; - fmdev = (struct fmdev *)arg; + fmdev = from_tasklet(fmdev, t, tx_task); irq_info = &fmdev->irq_info; /* Process all packets in the RX queue */ while ((skb = skb_dequeue(&fmdev->rx_q))) { @@ -328,13 +328,13 @@ static void recv_tasklet(unsigned long arg) } /* FM send tasklet: is scheduled when FM packet has to be sent to chip */ -static void send_tasklet(unsigned long arg) +static void send_tasklet(struct tasklet_struct *t) { struct fmdev *fmdev; struct sk_buff *skb; int len; - fmdev = (struct fmdev *)arg; + fmdev = from_tasklet(fmdev, t, tx_task); if (!atomic_read(&fmdev->tx_cnt)) return; @@ -1535,11 +1535,11 @@ int fmc_prepare(struct fmdev *fmdev) /* Initialize TX queue and TX tasklet */ skb_queue_head_init(&fmdev->tx_q); - tasklet_init(&fmdev->tx_task, send_tasklet, (unsigned long)fmdev); + tasklet_setup(&fmdev->tx_task, send_tasklet); /* Initialize RX Queue and RX tasklet */ skb_queue_head_init(&fmdev->rx_q); - tasklet_init(&fmdev->rx_task, recv_tasklet, (unsigned long)fmdev); + tasklet_setup(&fmdev->rx_task, recv_tasklet); fmdev->irq_info.stage = 0; atomic_set(&fmdev->tx_cnt, 1); From patchwork Mon Aug 17 08:31:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen X-Patchwork-Id: 11716979 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 80C65109B for ; Mon, 17 Aug 2020 08:33:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A25F20866 for ; Mon, 17 Aug 2020 08:33:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZOndhxRJ" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728134AbgHQIdF (ORCPT ); Mon, 17 Aug 2020 04:33:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728364AbgHQIcw (ORCPT ); Mon, 17 Aug 2020 04:32:52 -0400 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0312C061388; Mon, 17 Aug 2020 01:32:52 -0700 (PDT) Received: by mail-pj1-x1044.google.com with SMTP id i92so7644337pje.0; Mon, 17 Aug 2020 01:32:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=BpUIfyiY1033QwITtcsFngj/BQQY04YlOMIFJZLa7+8=; b=ZOndhxRJ3kEbaFup5uwE3vRCh/fWHZK/tTXskLR+/ZHLmu2kJ6agoy8gcsU8BZgSbQ bNx+AiqivgU2wITRcKzE6YwQOFztZ+p5H6AWYfOGLc9MJkukU+jiVY2Db0tb+smV09Xb pFEC3viI/CDZFUzGwEsXRQm27W37vYPaM9vMxJdwMqjL79GhfzUjjug9fWzEe7wl4fQ5 lVSJ+ALfHyMuXyDOR3awBvGAqPX62bNsMpC23qq/nVCDllUu5DgKd1ICkUt7Qk/PQ67F GtWE3HdpmEzQTDxHoW+ss2rkANsti/yv4L3PIgXpwW/FdOD5apQZWgjwj5pCPZraRxGP yBDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BpUIfyiY1033QwITtcsFngj/BQQY04YlOMIFJZLa7+8=; b=FEjkldx3zP+W3AubP0vy0qaBYdn/GeMTw5r5eF5rJ/8/01j3tARTNsypbHuhUIjyyA wKKw9omtP9IvcwrjBxxL+IkSQRopI+O82MzCd/NZKAN1j4/x/nuqxq19tIJsMa1AwBLo u9mPcN65IPu17AQtenD+j8qZMEKAIIUmkS75Oq4eXLdJT0ntY4EP9NZLHqCyNrPjcEf1 aQw3aEW6LNEr6sjvLW3xX4hv1aO9sx9Kv4F8XzW6LljOoCZxpvNr06lrERch5WWSJvSe 5QYQa4fxNw2jAQxN+hPwQdxl3Az749/IQ2K7laHzlRpnfgZpipsSKqWkpXbrOPSNC0SG eWXg== X-Gm-Message-State: AOAM530dRCiC41KqezXpM3CL/qn+KZmk5zzy/teJdqg6uHuF5s7aV6x0 HBmhmwAu5WN+0xPtn3Piop0= X-Google-Smtp-Source: ABdhPJwaWkqCYqUBJJSToCQOkC6GsGzRFgolzc1uotq1Pm6RULRT8DqLVDN3+wpVySp9QLmAIY3Wmg== X-Received: by 2002:a17:902:968a:: with SMTP id n10mr10479044plp.67.1597653172452; Mon, 17 Aug 2020 01:32:52 -0700 (PDT) Received: from localhost.localdomain ([49.207.202.98]) by smtp.gmail.com with ESMTPSA id b15sm18448351pft.116.2020.08.17.01.32.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2020 01:32:52 -0700 (PDT) From: Allen Pais To: mchehab@kernel.org, maintainers@bluecherrydvr.com, patrice.chotard@st.com Cc: keescook@chromium.org, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Allen Pais , Romain Perier Subject: [PATCH 11/11] media: ttusb-dec: convert tasklets to use new tasklet_setup() API Date: Mon, 17 Aug 2020 14:01:53 +0530 Message-Id: <20200817083153.22218-12-allen.lkml@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200817083153.22218-1-allen.lkml@gmail.com> References: <20200817083153.22218-1-allen.lkml@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org 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/media/usb/ttusb-dec/ttusb_dec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/media/usb/ttusb-dec/ttusb_dec.c b/drivers/media/usb/ttusb-dec/ttusb_dec.c index b8d39b2f777f..df6c5e4a0f05 100644 --- a/drivers/media/usb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/usb/ttusb-dec/ttusb_dec.c @@ -769,9 +769,9 @@ static void ttusb_dec_process_urb_frame(struct ttusb_dec *dec, u8 *b, } } -static void ttusb_dec_process_urb_frame_list(unsigned long data) +static void ttusb_dec_process_urb_frame_list(struct tasklet_struct *t) { - struct ttusb_dec *dec = (struct ttusb_dec *)data; + struct ttusb_dec *dec = from_tasklet(dec, t, urb_tasklet); struct list_head *item; struct urb_frame *frame; unsigned long flags; @@ -1209,8 +1209,7 @@ static void ttusb_dec_init_tasklet(struct ttusb_dec *dec) { spin_lock_init(&dec->urb_frame_list_lock); INIT_LIST_HEAD(&dec->urb_frame_list); - tasklet_init(&dec->urb_tasklet, ttusb_dec_process_urb_frame_list, - (unsigned long)dec); + tasklet_setup(&dec->urb_tasklet, ttusb_dec_process_urb_frame_list); } static int ttusb_init_rc( struct ttusb_dec *dec)