From patchwork Thu Feb 4 15:18:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A56F4C433DB for ; Thu, 4 Feb 2021 15:20:30 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6CC1664DDA for ; Thu, 4 Feb 2021 15:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6CC1664DDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IfPGJQnadwbJMjMNphRg/OY5t9Ad3RU19hlvaE2k6M4=; b=oZ/J2esmA450ubYikjZeudrjK d6PI9B3C/eaLi5fhxsrnRzwtP2ztRWGCcdrcP3zmhuusLCUr+2FJG+zLk8zAIZI9lx4A6hjyfg148 4bVoZf8IUK5CNN8Pb9mz+PUoVhwILhtqy+IsWGyBDWysLoyGyVMyfEpTNOc3khmT6aamyttrELJgO vfAp/gYqOR+Aw7rrqsyn/1PBJltDa78FFA9NyQ00Q8KPsKUTcgspehBeHk6LRZAsH7RuWAvNPyeA5 vVyzdKPRApVu/DqEBWJB4aX6h/2C+uj8iG86uWEzJRytHoO/dbaWhUMtzvY3d9hxBznESu5MXOdBE eXj+Znd8w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPb-000880-1u; Thu, 04 Feb 2021 15:19:15 +0000 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPW-00086M-LO for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:11 +0000 Received: by mail-ej1-x629.google.com with SMTP id w2so5852123ejk.13 for ; Thu, 04 Feb 2021 07:19:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M0B41tZ9BhfpLW130tpoMukMFanCubX5mUQuKs1xFi0=; b=iYWnQw3hSsJEBErHWKDUIRMWHyND3VAfFPvB7gVkyB8D18b3eaWSt3iNjvjvrbHWQM 75Vdxp1oU1adk5KW22osTw+ituLWAmeQZ2m08qmG77wDsF0+nVY+IUxgrk9JjbLp6EM/ /Kf+nWKF1Bvd3a/oDHc2dxC+025HVLbw979OaCKqQpQUDOcbohLmO/PA/YqbcL8Jd33S ubUuQ95FsYX8UhwW7TJSqjN4SbxPeKoDFJXIFxi6zEbW1jS+Em2KWNOCjy6whR7BhlEq /QDuWCX6ldtTobr44tD7LVzn0l9ECAftuz5mpgLeUQkUUMFPrf9nPHpHp2toJ9qhwaVM YNtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M0B41tZ9BhfpLW130tpoMukMFanCubX5mUQuKs1xFi0=; b=SGfforveb2qXbg7qF1jKjU/qAAn5hiqOCon02p4nTut4yApb8KpQ4abDkwQGi+MRP7 RJI7EezLuZ0s30w7ebqlIa9ZnVLQla54M7yUJO1+w/DdYqAn1GFdsU5UGoaaM1+4rMq2 9VNaZPD0zA/cy+Ug8A64cuYPnjybO6h/AjFedBDvHiknmS/FhZIOEX4lBXbhLXk6Mhwc d6H3a2+sOMVe9RzN/P+yzcBVvXOaMKtg25RFF/oWSvMgT5oBHsDI8fl8y4h6I+quhvqt zhwSEsqK7YQJndQatZGZ+VrscIIX0XLBfw7HcDFDQgi/tCam1Yrf89yijwn0dh4WP1ER uF6A== X-Gm-Message-State: AOAM530r0X2hdiql5L6qYbG1WWe1ui3UJAq1ykvz/806W7qgQzMtIKoZ IzcKV27CrQK80zmhlu+C6SA= X-Google-Smtp-Source: ABdhPJyM0C+Whgrs7E27chcilpw2rTGgXyVbl/SoxO+o6Bj9uU3gr7yZUEbUSLYC1hmFrOCVw36NEg== X-Received: by 2002:a17:907:7289:: with SMTP id dt9mr8477022ejc.446.1612451947555; Thu, 04 Feb 2021 07:19:07 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:07 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 1/9] mmc: atmel-mci: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:39 +0100 Message-Id: <20210204151847.91353-2-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101910_739684_D30DBAEF X-CRM114-Status: GOOD ( 13.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/atmel-mci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 632412066eda..807177c953f3 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -1719,9 +1719,9 @@ static void atmci_detect_change(struct timer_list *t) } } -static void atmci_tasklet_func(unsigned long priv) +static void atmci_tasklet_func(struct tasklet_struct *t) { - struct atmel_mci *host = (struct atmel_mci *)priv; + struct atmel_mci *host = from_tasklet(host, t, tasklet); struct mmc_request *mrq = host->mrq; struct mmc_data *data = host->data; enum atmel_mci_state state = host->state; @@ -2496,7 +2496,7 @@ static int atmci_probe(struct platform_device *pdev) host->mapbase = regs->start; - tasklet_init(&host->tasklet, atmci_tasklet_func, (unsigned long)host); + tasklet_setup(&host->tasklet, atmci_tasklet_func); ret = request_irq(irq, atmci_interrupt, 0, dev_name(&pdev->dev), host); if (ret) { From patchwork Thu Feb 4 15:18:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067533 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29EF6C43381 for ; Thu, 4 Feb 2021 15:20:34 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E451964DDA for ; Thu, 4 Feb 2021 15:20:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E451964DDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ddr90RvVi9U6goyg+Pxy6K1JsqUZw7CP6NFgf6bwj+Y=; b=uvtObcBQFUf7nJh4d3Yna9Box 3Ca+5EG9yBgPZBhPiLCa+6Ccq+0WSeTzNsfuBdmbNBfg4TdpmtVMS9huJZkkt2BwKThwxPhGQEJR1 7/TPPwhaqHlmu2ndEUZ/F5bjq7d5Dqso9Nr0lwpnE49lMLFhP/iv2OuRdg4rWJQHB9HxCSF3BN6q8 MZOKDymcTBbKMne7jQQINUS9EyrtHx8ZwlxEgnhjtqYgPQr7RCzUBnJK6+RienssZVw8enLysAqGV yHEhuy+sdtFxWne9rnCiYxvHjpg7DU+z4MRyVmQAZwENXZn0uMRYCkI5Rz3g+kMBtbpVaJHNvI25p UTSlyxg7A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPi-0008AV-Ns; Thu, 04 Feb 2021 15:19:22 +0000 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPX-00086Q-IA for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:12 +0000 Received: by mail-ed1-x52f.google.com with SMTP id l12so4616777edt.3 for ; Thu, 04 Feb 2021 07:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kA7iM6G+tHsHX5qw3wt51wVo7E+zCJZCLkoKnrDKq4Y=; b=W4cfV5/0dL0av9SOsoeYkRGZsmBPL2hqK42EOZerpGQsi95XPA4dnspkZkdpAAMxSV pkb1zX3XZmCCxKcJYAZ2QT8iUpEbAXozdkFoXAcgvC9vCHP4mWtSdBjYteMEQnpxQ+M9 4ZT7Rg5fFI+ziKmlcRx3AE9wuiTaZhQWlslkBkfz1JdfvwAbG7AQI2EHg/hs1LRkYx2u 9QZF+bsyZ8HOUIeZ/32EINf43pmwMmIJgv6ilOFsU4JRaLTuQn2Dt2b5AgSzB9U0aKUy +lMc95NaqxZwzHg/4lAZl7JAeQQeoXe7gxLfXRs2NfoDKGIMeqn5fXKbcBHPfZRRvmQ5 jTAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kA7iM6G+tHsHX5qw3wt51wVo7E+zCJZCLkoKnrDKq4Y=; b=tCRijoEIT3lIraUPnXMslrTXI9rKCQRE3QK15ilMz1a9qUfwlKfLB5XrnBU5ZbxK1p 1yrOfEm5j7DsXG7LQZYYwhM9YrpYWINQ/Zbt49Kj7z/2w9vDFi8mF3xWa1gqmHsuB0to EdWlFJFkGQBj6yik73A8FO69rjB+Rp2l8mkPjjHaf2DruU67sPv6npYR7kn0QCH82scY rkATZASHlM6HVQPRfDHtBUzCFyaSL8rq4CNohAS5bDtmIBzK7RtM/OdX7xrOyetM+Vhv lddS2mSvyy9H6lpqzNIS/0pTqeuIsb1laILUNwMUrpmlQ1gTMj6ur46RNcCH6hufjzqW vikA== X-Gm-Message-State: AOAM530zTYeWmfvTr1Dd7z0K4q7Vf+TDf9OobeIiXiSZkziITdGwdL3r AkRin60E7zX9ptohVGnjwt0= X-Google-Smtp-Source: ABdhPJwfG3Ce99XsaCXs91f6lfYXHfdV7XQFeKGSYxh2mMSowdr1KYmIsT98CTsuVcyOQJJGG9coHQ== X-Received: by 2002:a05:6402:3487:: with SMTP id v7mr8562518edc.68.1612451948549; Thu, 04 Feb 2021 07:19:08 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:08 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 2/9] mmc: au1xmmc: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:40 +0100 Message-Id: <20210204151847.91353-3-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101911_673448_16937044 X-CRM114-Status: GOOD ( 13.56 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/au1xmmc.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index bd00515fbaba..0acc237843f7 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -253,9 +253,9 @@ static void au1xmmc_finish_request(struct au1xmmc_host *host) mmc_request_done(host->mmc, mrq); } -static void au1xmmc_tasklet_finish(unsigned long param) +static void au1xmmc_tasklet_finish(struct tasklet_struct *t) { - struct au1xmmc_host *host = (struct au1xmmc_host *) param; + struct au1xmmc_host *host = from_tasklet(host, t, finish_task); au1xmmc_finish_request(host); } @@ -363,9 +363,9 @@ static void au1xmmc_data_complete(struct au1xmmc_host *host, u32 status) au1xmmc_finish_request(host); } -static void au1xmmc_tasklet_data(unsigned long param) +static void au1xmmc_tasklet_data(struct tasklet_struct *t) { - struct au1xmmc_host *host = (struct au1xmmc_host *)param; + struct au1xmmc_host *host = from_tasklet(host, t, data_task); u32 status = __raw_readl(HOST_STATUS(host)); au1xmmc_data_complete(host, status); @@ -1037,11 +1037,9 @@ static int au1xmmc_probe(struct platform_device *pdev) if (host->platdata) mmc->caps &= ~(host->platdata->mask_host_caps); - tasklet_init(&host->data_task, au1xmmc_tasklet_data, - (unsigned long)host); + tasklet_setup(&host->data_task, au1xmmc_tasklet_data); - tasklet_init(&host->finish_task, au1xmmc_tasklet_finish, - (unsigned long)host); + tasklet_setup(&host->finish_task, au1xmmc_tasklet_finish); if (has_dbdma()) { ret = au1xmmc_dbdma_init(host); From patchwork Thu Feb 4 15:18:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BCBCC433E0 for ; Thu, 4 Feb 2021 15:20:31 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id F2F5364DDA for ; Thu, 4 Feb 2021 15:20:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F2F5364DDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=kMmtdwa/f5Kiiqp47JP2ml4LLnqmBlSj8FOxLD74pWA=; b=Rpz2e9UFLtGilcTrXJCKTfHBt gH29BwBPhX3B5I9Z3vqUVAfrSdkTZAgNuPXF7QM3UUvszLveOFiJNVRj9oEM9ywvpu6/SHMdUIz93 e1IeDpSrb7+y4hCI+pu4UHSCtl504MeD8ILD7RPtolTWHNvMDpxbsz0Y2qmr4zCZIVVo1/v6ZFnDw vYoF2n44xwkCDIo6v23La7aPgSusukxHMHGBX3O5keOCFdaMTu/wqvh1+QswjjlyQWXWX43DomwHZ 5FWMwsA/askmcLMa6oiDcMllNNbEz3wqTm2D0CZ5y07msp7PBbhGd9ZEBHG+tVqXrVGzPxFLvGZx3 9MtSrYU0Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPe-00088l-90; Thu, 04 Feb 2021 15:19:18 +0000 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPX-00086f-DM for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:12 +0000 Received: by mail-ej1-x632.google.com with SMTP id w1so5871098ejf.11 for ; Thu, 04 Feb 2021 07:19:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Ztwrmsm6gQAgLIEitmcEoJqCpEXF+Q5ciHAZ3tgDxw=; b=mRQ5xqodp26jOz8LqunuNzwLU0YL/YgEsvxJ+8kuNGzv1/OpnND4QdHXcQNNDxcw9o bEZEdkHyFB5+BpvmAYasq/PQT18rC5R+kJzCWUJcOaldouyP1Mdei0NoNgBcXTDURzBm 2fcHnfwWQqTX66Bq7FOuhVJzdy2xul+opPhrhjhnTCfW57yGCfU8ivQfj1/X6xXlc3pr k0P4ci138hfwrSgoD+ZI7mx1cimo5n03oWhPKfsLDxlsiPQRXVqzHAemYdiSGWZH7n5I ZA1Bog1w1xuqeP+POAgwULTiLa/aCibA1g0GT4Xupxe4i1CrNZ8vDOcaKrjJUfhjBNNM PXjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4Ztwrmsm6gQAgLIEitmcEoJqCpEXF+Q5ciHAZ3tgDxw=; b=HmwiPW4FRVJe8bBya5y35sXmkmjkjfhlK35gtrHkZ1+Slk5spi5Y5yR0aWC8bn1m/g tvy4Gip4uX1oSmO81gxR/QznVS1g8BbjK8T5jtTphZzglFn6YWkjYGrtNbmRslgAseiw j45tAsRFCgWn+dEKan/ab/hW6awVn51uSE5TakMt4Nb+zMyXqo9M3c7P/nduoRA/OkDE 1Seb/effVX+niF64J8o6AiNSRUTxbPkt+VawNiWoW+3YfEAWg8jKB67r7aLRzD0sGqEu vw4sGtiA+EH0kfxCZ4gCX2F4+vs9FCd7ZT3tiC/922WLci6tSP/jKmZ6SQJze9e4EzSX UZ9Q== X-Gm-Message-State: AOAM531E9wQZjMaCUpOBLXg935KmZQuUUIXHiXkg6oYG+WiPwlhuz8rC YF5pKnGpgS1duOk3uRs7LUo= X-Google-Smtp-Source: ABdhPJwIDsLfmE8dMsrsBsSwNtKWXrU7ViHCPtARzRsAkMyD6j9j9GkqDwtVUArnOtFintcqgVRILw== X-Received: by 2002:a17:906:6dc6:: with SMTP id j6mr8261860ejt.88.1612451950067; Thu, 04 Feb 2021 07:19:10 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:09 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 3/9] mmc: dw_mmc: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:41 +0100 Message-Id: <20210204151847.91353-4-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101911_485627_FBBB3CE9 X-CRM114-Status: GOOD ( 12.61 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/dw_mmc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index a5244435556b..2f4de30f650b 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -1952,9 +1952,9 @@ static bool dw_mci_clear_pending_data_complete(struct dw_mci *host) return true; } -static void dw_mci_tasklet_func(unsigned long priv) +static void dw_mci_tasklet_func(struct tasklet_struct *t) { - struct dw_mci *host = (struct dw_mci *)priv; + struct dw_mci *host = from_tasklet(host, t, tasklet); struct mmc_data *data; struct mmc_command *cmd; struct mmc_request *mrq; @@ -3308,7 +3308,7 @@ int dw_mci_probe(struct dw_mci *host) else host->fifo_reg = host->regs + DATA_240A_OFFSET; - tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host); + tasklet_setup(&host->tasklet, dw_mci_tasklet_func); ret = devm_request_irq(host->dev, host->irq, dw_mci_interrupt, host->irq_flags, "dw-mci", host); if (ret) From patchwork Thu Feb 4 15:18:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1BF9FC433DB for ; Thu, 4 Feb 2021 15:20:33 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CDACB64E41 for ; Thu, 4 Feb 2021 15:20:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CDACB64E41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/N2vOe/zqElAb0ut9ZZB0hkLOq73RAlTnOLbG1PG4xI=; b=Bge21PSyOSxePiVQw+hdq9UUU R4Zq+rwe3KI2webFOAj61R+kDtxFztWTHh9n2qdxwgaz/pQHfW+5i+e2Azb7DJXreN0iiUtVY05R7 m2ljOCqC7+aJsbImhYDe4H9geEO1URf1Wqdam0u8q9xL2sA4Tbsx6z5A0nKClp9S5DF1OPHdQZsRn PTjeR5VDdeqa60CYJe2yl6oy8BB18e7sfQ+ccwH0WHRCwlR/b87U+to+wbDL4+rTuG52xach9lfkV s0yLY9t4OpOn+aoRTwM18f7mkE12idaUQ8X2PwYZ2Wqso7F78os/1TlixOJ7a/55VkbYa1qOzZjdh WWbYWrvSg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPp-0008CE-CN; Thu, 04 Feb 2021 15:19:29 +0000 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPa-00087w-S3 for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:16 +0000 Received: by mail-ed1-x52c.google.com with SMTP id y8so4585626ede.6 for ; Thu, 04 Feb 2021 07:19:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MXxWaP3OMD24RnZ/OSVIIbiGQ1wOqMXQ3YDzBvlfZKc=; b=Y9ukjEkFtjspHv5gHEuPAtYlxRPD5EcQz/cPxJRYXU/NRBX67UiJU5GQZr03n9ZZ6e OR3+LT9H5tAY7svvli7sOSAIQttxbqbYnxgPNG4uXWN41N/2uzVwv0PRfk/eGdFT/iVV Dhuyv/lB2naVSMm2OgKyCBEUzzlmPj/726yvckg6V7Yo2pB646XbBBQu1DUnSS6p/Nrx CxgGIfCQ8zmqp0qBvlPf8nvIuzIoxmM9wEML2s5TtE30SW5tZVzuakVPAJF/ZO/irGzD YaEVCAJ0HvEB3dRMmugCdgLSN+rsab8QoclToeqBkUQcEnv1Yko17CQRNZuN8KMklPZR Rvqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=MXxWaP3OMD24RnZ/OSVIIbiGQ1wOqMXQ3YDzBvlfZKc=; b=srwzTrTjw2vb3X1U8tFnDJu4ZzJFniqaPnWT7jwMK8QqdpjZkNpQFVX5+B1/in4Yz+ TzHk3otHmYVelXdFpwgrTukvsY4nmsG4cmdbj4Ob0CCietU4mLpZKa46cO3LrS/zdmUx swX/nD5AeuCDscU1QNTMLa+0b7oTIYcVKqFl77VUIf1mNDtPiKYix+yBJWnycUNDkHV3 2IWKSZ1rJBJXtSrJVh68jro48dajM+i/+7NiOXFx9agrvorh+5C4+BbJzULXD+4jJIBv q0Qa3ScUAoTm3rb0+zi7oImbqpNomEsFgUJafxsHPrriA8jKEs02EK6hsRRt+KcbwH5E oaXA== X-Gm-Message-State: AOAM531U+Y5uxC6eT0fPedk+5VQ4m3rlPRM3IveaiPETJkkinJPEPnkL UXE7iaHdUaLkAkTLmpUg54M= X-Google-Smtp-Source: ABdhPJyPq3p6MXw+NKWx1K05eqiXDRYZGsAJgrrr++6DtWr4V3jzMLDk8+xPLi3Fi+f7Z1ImdeULrA== X-Received: by 2002:a50:8466:: with SMTP id 93mr8342762edp.55.1612451951546; Thu, 04 Feb 2021 07:19:11 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:10 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 4/9] mmc: omap: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:42 +0100 Message-Id: <20210204151847.91353-5-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101915_033624_558E9868 X-CRM114-Status: GOOD ( 12.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/omap.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 6aa0537f1f84..5e5af34090f1 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -878,9 +878,9 @@ static void mmc_omap_cover_timer(struct timer_list *t) tasklet_schedule(&slot->cover_tasklet); } -static void mmc_omap_cover_handler(unsigned long param) +static void mmc_omap_cover_handler(struct tasklet_struct *t) { - struct mmc_omap_slot *slot = (struct mmc_omap_slot *)param; + struct mmc_omap_slot *slot = from_tasklet(slot, t, cover_tasklet); int cover_open = mmc_omap_cover_is_open(slot); mmc_detect_change(slot->mmc, 0); @@ -1269,8 +1269,7 @@ static int mmc_omap_new_slot(struct mmc_omap_host *host, int id) if (slot->pdata->get_cover_state != NULL) { timer_setup(&slot->cover_timer, mmc_omap_cover_timer, 0); - tasklet_init(&slot->cover_tasklet, mmc_omap_cover_handler, - (unsigned long)slot); + tasklet_setup(&slot->cover_tasklet, mmc_omap_cover_handler); } r = mmc_add_host(mmc); From patchwork Thu Feb 4 15:18:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067535 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AEA6C433E6 for ; Thu, 4 Feb 2021 15:20:42 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id EDF5364DDA for ; Thu, 4 Feb 2021 15:20:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EDF5364DDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=zIOHGZJQ4wKsTcEcaC6bzU0b/ZF+D+Ln+9JkkxSfDbs=; b=NRwL1jSUroYrdkxzRb4FeheKh 1Vhnk3eI3Im+CEywkAafBXUqXDsEuqxzNUiyGOaTzSvR7Opeao9FSv9xAO0cypAnO8zGkjALgy5qW ptgI8VsBIzWZXBFhwytlq2NvTeNTqMF6sRibtZD20XFUexjK7rtIQ6OLD8lgbu02f1HdshWqiHkwo iw8jitOnmRYcWh/sbjsILWw/GVDaxsnrY911j0thTv7xKl8Dw/hpugdynvNQIFymncNPRfjCM+JxV jOLB5UaNh7Y0fZOsvSL3H7DfcER1ofRpTUWDYp5Jj+WkSAEO+plWV1DRxsPZGrUCfn0iyZdy/SpJz 4RAWhMiKQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPs-0008Dg-PW; Thu, 04 Feb 2021 15:19:32 +0000 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPc-00088B-7I for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:18 +0000 Received: by mail-ed1-x533.google.com with SMTP id q2so4606761edi.4 for ; Thu, 04 Feb 2021 07:19:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LhxDawnboy/GOphLJPpwmu1nF8PhAWga8yWTDRyj8XA=; b=HHM0tu+en/eiYDTTVtlaIPgY73OWrtR8jXN3A7v8VdCMFu1WCO03MK1uu37ltdUyrA baMzWM5FUOYzCHmVv1foThsw0iwyok9Di2vg8TVPZCSoYgIZ/OOfY4v/goTOE4Uwyowt 1/H6erNXJWEtOO51eDB/c5tk8X71qffK22OUmXK6QpB06rQZaRPWikOqL7+GfFrb2kTw 0DJAtUb2WywdQwU6wsik3h4AGOQsCgMXUGK0a/W9woFfU3o81A7ZA6pFdC0B4vo6yRnR rSd5+O35CW3dhOpbtztWWKHdc7kPaqFC1MgvlOrF6Yut0roaByCX79cLY6SPZ/Z63tsr 26mQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=LhxDawnboy/GOphLJPpwmu1nF8PhAWga8yWTDRyj8XA=; b=e98M0Gje10hAkR0AFpJANJR8cfaB1kOqKNDFN9mdc3EqhWOfvEiwtTWHDgD0zNuchX ylZlSyYGqkZ0sOH8eQUqPdnGdei80+vRsBePhMs1tlkUc+2jwJrarXxRHWvHJ40/0PAQ tUM8AJH5dqni0IYfMzg4yI9mytrh+XJUSrV16zCgxBwrQ5UdonNtvy7mnr3UWjnT9s8e /sjJt+tJ4ilg/8ym1uEO4R4p1i1R+WjahUMwpxBgPE/rF7cEoVoexK52ARZDhGfpU97S Y29oNMgs6x3u/BIZNjJRIKEXYopPy6oxkQXEqYhzi6l3AmFeB+OI2Vd5BSm0jI/AqYte UunQ== X-Gm-Message-State: AOAM530R15AlDT5pBWEgkfWrbWSXdwLyfxBWMlC24y7MtQIzc4kiX/wk Zu9g0+NmEtOqtBAKBr5hyXg= X-Google-Smtp-Source: ABdhPJwKity2jdws4yrIx+7J7mgQzjqxjDjle4kCJ+oulDjfv3k5nDcDMydPchdLcweT589z7HQq1Q== X-Received: by 2002:a05:6402:1484:: with SMTP id e4mr1079509edv.104.1612451954704; Thu, 04 Feb 2021 07:19:14 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:14 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 5/9] mmc: s3cmci: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:43 +0100 Message-Id: <20210204151847.91353-6-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101916_309352_69140261 X-CRM114-Status: GOOD ( 13.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/s3cmci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index a33a7823c265..0ca6f6d30b75 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -540,9 +540,9 @@ static void do_pio_write(struct s3cmci_host *host) enable_imask(host, S3C2410_SDIIMSK_TXFIFOHALF); } -static void pio_tasklet(unsigned long data) +static void pio_tasklet(struct tasklet_struct *t) { - struct s3cmci_host *host = (struct s3cmci_host *) data; + struct s3cmci_host *host = from_tasklet(host, t, pio_tasklet); s3cmci_disable_irq(host, true); @@ -1532,7 +1532,7 @@ static int s3cmci_probe(struct platform_device *pdev) host->pdata = pdev->dev.platform_data; spin_lock_init(&host->complete_lock); - tasklet_init(&host->pio_tasklet, pio_tasklet, (unsigned long) host); + tasklet_setup(&host->pio_tasklet, pio_tasklet); if (host->is2440) { host->sdiimsk = S3C2440_SDIIMSK; From patchwork Thu Feb 4 15:18:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067537 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 862A0C433E0 for ; Thu, 4 Feb 2021 15:20:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 383ED64DDA for ; Thu, 4 Feb 2021 15:20:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 383ED64DDA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=+qDWCCFG2QFFhB+OnGy9H/YVgejWgOciOuI35qypzOs=; b=032taW6IjQZx7jO76Z7BSb6Bu 9qCIgajEFmgFZcvhrqTHLbDLRUcGTGyg2fzr5whVhHMWDmTFZ1iJG9WM8vJcTTKgJ70gnpwo3hplL 7w0h38NNCXsgMY1uKt2KfxRkIPYwTvKbmy4kMWNRfgugkKj+yTLCWUbvxffRsBmL5K5WEoafupetn Vs4lCLNTJBuxGpHflNMocVYprbmZUC8h9eR8nTL0Tddx2b10x9K1nZyGR8Hl7Aw5oeJTSJ+16md+l xc7TfaRF03jEoQOF0GnBdRdtsAtuVxBEwff82QOH2y08m7jis71MyK3FIMiXCCBm94znrLm8H/O8b ivVk2csJw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPx-0008Ee-Al; Thu, 04 Feb 2021 15:19:37 +0000 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPd-00088d-3j for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:19 +0000 Received: by mail-ed1-x52c.google.com with SMTP id i5so4552103edu.10 for ; Thu, 04 Feb 2021 07:19:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4t6PsBrxLZ5UTEGPBoOEAai2ONn3/gIQgFeqq55RME0=; b=dl7XayJ5ZZtlj2NxoVsVvbvmImyaVKnGXuxpCPR+o9CYjyWD/tFlLmIIf3GkKH6iNf nuRX7RpF+nb9qOBAJova7MSSQ2cadUwIhSKNBxhXu4Xyewmn5KXnx/WfSbwyo3hSB4sw ufSFB2d0KutTspXPxf7PukV/mRlpu5bBa64UkJHC2rv0sBsPPJfvKKUIIRGvRoucwoWm 4kGU/8xWYMXMupMpO9I8MeseYxgIkMKHrOu6VX9IylQV0RSbLpHSzuiV/jGQn2fcQS/7 sfMucw4Z+YxC0G+Iil/LqohjxbaLkO/miES8JKc4SoeFgVIJ0C2CbBe9YrfkYbPtzB6d kqqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=4t6PsBrxLZ5UTEGPBoOEAai2ONn3/gIQgFeqq55RME0=; b=cKQ4JqSTgIzqlmcokU6Mn1rRgoRIuE0FxvYZKhtZ0s7eO0Ef/FBhlSJ6Xl/dS43gXS 1wNVCS/uPyemcaySj+y/48qgjRKqbZdVQFh5l+YUrBGS6vrW2Pz4uQbUVzp2UL6ORLD8 uWZ5CGzuUYxvtIvHJNnjg+k6H0g+LufpZkYHOu03pxPwZ2HTQpfPFvM74O+aIrP236AZ rHWLZreqOV27+STh+WdJf8UoaQGq/cQVeQeGAssLFF6iPQ6jKYZct9tcVbGlUszmvaCY 0o4euZu3bQeQaFGimBcK6iZ3ruvbBIpYk/RxCc+KnqUmb9S1uQ6G1fbecLGE0GS4TA1m drAQ== X-Gm-Message-State: AOAM531sR5ROUKHV7ZS6zLyajkB2TQb08WOZw1zipvm5CNGb9ePMukcZ cKXBT5He4i7LZSzgtuUNn2c= X-Google-Smtp-Source: ABdhPJzjyf4iJXj0C/1GfT9PvnICS23k9kQYo+BRNVNiF2+Upy/bNN6K1UgKwUZ3NJV9xENOVOzYQQ== X-Received: by 2002:a05:6402:208:: with SMTP id t8mr8345346edv.189.1612451956240; Thu, 04 Feb 2021 07:19:16 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:15 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 6/9] mmc: tifm_sd: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:44 +0100 Message-Id: <20210204151847.91353-7-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101917_250082_6236C205 X-CRM114-Status: GOOD ( 12.87 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/tifm_sd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/host/tifm_sd.c b/drivers/mmc/host/tifm_sd.c index fd8b72d3e02c..9fdf7ea06e3f 100644 --- a/drivers/mmc/host/tifm_sd.c +++ b/drivers/mmc/host/tifm_sd.c @@ -731,9 +731,9 @@ static void tifm_sd_request(struct mmc_host *mmc, struct mmc_request *mrq) mmc_request_done(mmc, mrq); } -static void tifm_sd_end_cmd(unsigned long data) +static void tifm_sd_end_cmd(struct tasklet_struct *t) { - struct tifm_sd *host = (struct tifm_sd*)data; + struct tifm_sd *host = from_tasklet(host, t, finish_tasklet); struct tifm_dev *sock = host->dev; struct mmc_host *mmc = tifm_get_drvdata(sock); struct mmc_request *mrq; @@ -968,8 +968,7 @@ static int tifm_sd_probe(struct tifm_dev *sock) */ mmc->max_busy_timeout = TIFM_MMCSD_REQ_TIMEOUT_MS; - tasklet_init(&host->finish_tasklet, tifm_sd_end_cmd, - (unsigned long)host); + tasklet_setup(&host->finish_tasklet, tifm_sd_end_cmd); timer_setup(&host->timer, tifm_sd_abort, 0); mmc->ops = &tifm_sd_ops; From patchwork Thu Feb 4 15:18:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067539 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 75B96C433DB for ; Thu, 4 Feb 2021 15:20:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2EA1964E08 for ; Thu, 4 Feb 2021 15:20:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2EA1964E08 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=vvwnnE1ReLYT5HIqgbGBYo88Uiogz0FHko+Kf91yxuI=; b=zvqhjgIVFd39f5Xbh+jHkr1L7 nrMTI8phM7XhrIPrFH6LX22H7smR+s2kRV/8s+8Sie/UuAqA6hZnd2irKwJvT6jKdGy2PZjoQDecn MKBiOiT3rdtL2aMxQZcdo5oPVvstqHOeA3Lbu+ioLm8piez5N5MVTRkdajlMtxt+c5yBeQyRU4jT4 l0xLAGkyUEwUrRoJtXLn7eKiE9Rit0m5V5avbrQ24CCwHogozRVB3LaSkgmmYtOYPTVQq2uO/4K+K kayA/Gb7roKvH9m82BEFeFw5NdXnIepjY3BuSZVTr6PYPZxbVm+gUEdRjUnZoUULqH3ewRKUi3pSz N62Il6kmg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gQ9-0008Jc-Il; Thu, 04 Feb 2021 15:19:49 +0000 Received: from mail-ed1-x52b.google.com ([2a00:1450:4864:20::52b]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPf-00089I-8Z for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:21 +0000 Received: by mail-ed1-x52b.google.com with SMTP id y8so4585925ede.6 for ; Thu, 04 Feb 2021 07:19:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oEFEAmIXC+si+Rsqnq5kk8ZiqPQSzbKTorEVbnyUtrQ=; b=Hfqb1+4R1GUz/Fq49+JCqN+pc8rKpE2gGtfvjDDmxll15xVwGMrHW+vIvMUrM/X/ZV AXGGEWknQyVw6tbyUbuUiekt+svajALlZW/cFplCV9Q9gPEp2myYaVaHYcnMsoUNAbMg LMLH+hB3PsItBvcL3c8lar4QvYq+1hyuGBhyGCg1oPOZHP+3t3qT6+aaPA1++GN/1ucO QEsCbOAmgNwpxkvLV/w6ZP7VxH5jvEe9T20N2tIu/0QzCyuI042GlnNBpBxz8AolrID/ t7rdr8OXwjjWmQJyzK9ciOrFMpECdBAkZRPAS+iY+Ui/+Wu15KuaeHiZVjSGp8ytLoEO NoqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=oEFEAmIXC+si+Rsqnq5kk8ZiqPQSzbKTorEVbnyUtrQ=; b=nCyky5rWP96cLKw4O0EhUZddlEvPGMLqecm9gXMgply3FyMVrkl00dXi/uizY0v785 +2Rmj6UafGZI6i6ZlWrW1+gOh7pedhUvJT1iRAiZHdSCvX2t7KEYTlPFK5Jxqp4ryYYI hT0Waw4dxDjmFUX+SjYNfxsm+r26BBkgMxJoD6bDG3t+Hobh59x56bmZW4rPeAmB4Wq7 tV5Ak3QKPqJ7Ii32HmMNqSHtKail79eDRNdHMKS8YIxeBXXluVKfZIOC+VaLB9dKbujI OfmHfbXSMuOIAaRKzg8GAU0s9BqcXVIMaTUrEyCk450UcutpzrGRksmHcClyuz5OchLr nh9Q== X-Gm-Message-State: AOAM530c/+0bH0cBZx4FCKLpb5PzG3JYDXrAgSglYryfKbKlXGJRPTLu IXMnzWOjmwMUdYhrN7o9fxU= X-Google-Smtp-Source: ABdhPJx/K6k06YoQR/hwfftcPlygX5tTSIxSg+9Is6MP8I2y+HmHxOno8nh+obmf63KnWwXXtRF/9A== X-Received: by 2002:aa7:de10:: with SMTP id h16mr8440874edv.385.1612451957817; Thu, 04 Feb 2021 07:19:17 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:17 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 7/9] mmc: uniphier-sd: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:45 +0100 Message-Id: <20210204151847.91353-8-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101919_380009_47F56281 X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/uniphier-sd.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index a6cd16771d4e..2413b6750cec 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -81,9 +81,9 @@ static void uniphier_sd_dma_endisable(struct tmio_mmc_host *host, int enable) } /* external DMA engine */ -static void uniphier_sd_external_dma_issue(unsigned long arg) +static void uniphier_sd_external_dma_issue(struct tasklet_struct *t) { - struct tmio_mmc_host *host = (void *)arg; + struct tmio_mmc_host *host = from_tasklet(host, t, dma_issue); struct uniphier_sd_priv *priv = uniphier_sd_priv(host); uniphier_sd_dma_endisable(host, 1); @@ -190,8 +190,7 @@ static void uniphier_sd_external_dma_request(struct tmio_mmc_host *host, host->chan_rx = chan; host->chan_tx = chan; - tasklet_init(&host->dma_issue, uniphier_sd_external_dma_issue, - (unsigned long)host); + tasklet_setup(&host->dma_issue, uniphier_sd_external_dma_issue); } static void uniphier_sd_external_dma_release(struct tmio_mmc_host *host) @@ -228,9 +227,9 @@ static const struct tmio_mmc_dma_ops uniphier_sd_external_dma_ops = { .dataend = uniphier_sd_external_dma_dataend, }; -static void uniphier_sd_internal_dma_issue(unsigned long arg) +static void uniphier_sd_internal_dma_issue(struct tasklet_struct *t) { - struct tmio_mmc_host *host = (void *)arg; + struct tmio_mmc_host *host = from_tasklet(host, t, dma_issue); unsigned long flags; spin_lock_irqsave(&host->lock, flags); @@ -309,8 +308,7 @@ static void uniphier_sd_internal_dma_request(struct tmio_mmc_host *host, host->chan_tx = (void *)0xdeadbeaf; - tasklet_init(&host->dma_issue, uniphier_sd_internal_dma_issue, - (unsigned long)host); + tasklet_setup(&host->dma_issue, uniphier_sd_internal_dma_issue); } static void uniphier_sd_internal_dma_release(struct tmio_mmc_host *host) From patchwork Thu Feb 4 15:18:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9790C433E0 for ; Thu, 4 Feb 2021 15:21:00 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7943664E08 for ; Thu, 4 Feb 2021 15:21:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7943664E08 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3GGK9myxehKve54+D7yvPEad+I6JBErPAU5DHMnsO+g=; b=FVQGERd3LnnuPUd84S3bmoPjt AobrjS2KB+tXIXxT+26qLqDW1ZYrYFU5CePoeVew2VThRF48my5feIp8MQ5itclLce+brABpZAbGs kn2B4JlYJzOQOuiOJbax0dmGUebH52ZRQ2wMygEAl2fN3etsXja20P1MPA8Lfi1hiGeI0FK5/BkOI 3+YOvLEGpPDffeicjtjf83Yo0KWeUOAr8lWPBVz65tTHRqCNSmkNtGEnnbxLYAXfiLweCqVfKIRu8 9OcXki9uUowu2NwiAHfAJz7yYUMPkZ1IDEXSCzWDBVnojGja3pxFhcXhl40qRhRYVr8ol9gqOshzC Lehal9NBg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gQD-0008MB-Vc; Thu, 04 Feb 2021 15:19:54 +0000 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPg-00089a-8z for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:22 +0000 Received: by mail-ej1-x635.google.com with SMTP id lg21so5970307ejb.3 for ; Thu, 04 Feb 2021 07:19:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=N2WmQEa3BjX3ncRzYIQrV88zAWNTStgvbrnt2gC25ds=; b=pLrqpZXobX/BN7V31Gin+rlULIYKilZRzPSg2xhaB7QQRja338SqRQYtB6sGduQR6t SpkFueZqQlQUV7s0D3t+VDoe2OSx3ZQ0jF8NNjnVGSKhdjjt3tv39fLJ6FokgRPf6MDH HIYJ4A1t11mjke3xCrDwNitdGe8s5t7C0rF+tmMcLoAFmsI0NHv3u1paYz6DizW7Dcee qJoPTnP501IOro5fX5d8YLp6cRf4/vCXxKn13ukVgCE97I6qboXn70vSgi53QRPGiG2P N3+dVCm3EcSc/1p1hABKXa0ZdSbboQHX9IAigI+SaCiwDVU4Pn7GcYbT3dGKlebfQsU7 Jk3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=N2WmQEa3BjX3ncRzYIQrV88zAWNTStgvbrnt2gC25ds=; b=euGXbOznKKy20590sOuQxIF1W/eBqphSd2raBTY6Lun8n0nAbfbdYzOSeJcdyTJr5s Db7MkjPoGsZHttWCqdztD+MlLnHhvRQ6YZDz0qhiZSAG5IYkXAGVn5Z1gMpSNPKelfap 3rOwyhSk/Bdrmce6PptwCzusDFIcmCcDD4bgl92UzvPucvjzwXTl4eKDx2QOmnx2FhSO lZoL6RP19weF3DxP4GbtMsRIrtUT3EK8y6vWBCtEL43696xZt9xo96QvGs4W/MqRlXT3 GMPwdwyFN03iKDHw1C8gi02Y7kpKSAqo3x5Vqv67vd8YmVt82j8QqmBEa+AzlotO9r/w ZRbw== X-Gm-Message-State: AOAM532QU+p5+PofOv/fDFF+NesYu0NGMeJ2kHNevcjPXHggv+bXQGuI 0xLqH7IdP9UFI1D2zxmjxMs= X-Google-Smtp-Source: ABdhPJwiILFpv5ahW61oLwlmasbtA/F6ia/OU2V3dbtBa3foPSZ6iMEwvO2Wb0/LY/T3k2+HMO4nDw== X-Received: by 2002:a17:906:43d7:: with SMTP id j23mr4464993ejn.519.1612451958882; Thu, 04 Feb 2021 07:19:18 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:18 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 8/9] mmc: via-sdmmc: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:46 +0100 Message-Id: <20210204151847.91353-9-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101920_951568_7E31C95C X-CRM114-Status: GOOD ( 12.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/via-sdmmc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index 9b755ea0fa03..4f4c0813f9fd 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -959,14 +959,12 @@ static void via_sdc_timeout(struct timer_list *t) spin_unlock_irqrestore(&sdhost->lock, flags); } -static void via_sdc_tasklet_finish(unsigned long param) +static void via_sdc_tasklet_finish(struct tasklet_struct *t) { - struct via_crdr_mmc_host *host; + struct via_crdr_mmc_host *host = from_tasklet(host, t, finish_tasklet); unsigned long flags; struct mmc_request *mrq; - host = (struct via_crdr_mmc_host *)param; - spin_lock_irqsave(&host->lock, flags); del_timer(&host->timer); @@ -1050,8 +1048,7 @@ static void via_init_mmc_host(struct via_crdr_mmc_host *host) INIT_WORK(&host->carddet_work, via_sdc_card_detect); - tasklet_init(&host->finish_tasklet, via_sdc_tasklet_finish, - (unsigned long)host); + tasklet_setup(&host->finish_tasklet, via_sdc_tasklet_finish); addrbase = host->sdhc_mmiobase; writel(0x0, addrbase + VIA_CRDR_SDINTMASK); From patchwork Thu Feb 4 15:18:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emil Renner Berthing X-Patchwork-Id: 12067543 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 80724C433E9 for ; Thu, 4 Feb 2021 15:21:13 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 313CC64E41 for ; Thu, 4 Feb 2021 15:21:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 313CC64E41 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=esmil.dk Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=0tQWzEnbIwWpYizya24/7X7ClMwhtZZvD8VedqfZW4A=; b=3fRhK+81Ec/Sg77HvX6Mk+V6O DHrEzHHmGJyftVgRRsjr9jdMmWAe4U07Ij6XNvCsJGGYmDbZto/f/HS+C9VjPW4vLTjb8V4TPWtfx LpEmpn3inr7W9oUen3ylBaMD7RIqpDMK8crM1/Z6zC3CQ2JR5/OKCSVAnl7mtUcmNfPL2/3cOlnFq HarSrZOtEUt49XdozUT0DZ5wYbLo7vwQL/dIF0u7YCcS2CkQvI9RR0G08iZQiSnCffS+nukjRrQZG HTdjbvaDsdiepYkjQOjDilDVgK/FgzpksTHAqca6s4hpeTaDY5vjDGOV3/x9aj4qFkReC+ShEvsCQ 9dqCa3tUg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gQK-0008R7-RU; Thu, 04 Feb 2021 15:20:00 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7gPh-0008A7-Rx for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2021 15:19:24 +0000 Received: by mail-ej1-x62d.google.com with SMTP id a9so5983373ejr.2 for ; Thu, 04 Feb 2021 07:19:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wQ9by59LAdcIL3bSIKYDI9kndSMy8tWgVlnC5RbynYs=; b=opVvsoKs6fxs4JdWQRnvYzqXR7VEn8BznKZMz4nb66HF+eQR7Ad9vgFqOydnNcedv6 pmDir5TIfbNsZuIWs/PEKHgVU4ZF4737+NaCIJ20t5ET7qMvflHc+OpGISceSbALeGQj tw+BTNebvCM1dABqMGvArUy2dJ5n36P2bl4xQlkjh0vCf0GvKvsxxzBHjIeayjLk5WoJ HwulDd7chsaqDiAiFZEhooM/vZarpVT1MLXXv7yc4WYleKqonootEzO5VJWsqGPMDc2v 7W9FAtLOvEW+5JNaomEEHSpxde0rpF9gRtphZUnk1xom16izZCUzxlWXaFmUUsMOmQV/ cUgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wQ9by59LAdcIL3bSIKYDI9kndSMy8tWgVlnC5RbynYs=; b=KQDMClsHW9PI/jl0qEvafgr6yDookrTiinM4MjAafklG8OAR237ri9JYxm17ksgmV4 M47y3JbPlbuizTOgJ4SiUx1WWCdnxdpkK0hba1m7HBnL2ccIGwrVONfVyc7EoFSW93AG XD7x819h4XrRdSjs9M/6CzLXuAtrq2j51MMgzFpzv+TxbOaW4TdEMsz3iWqQ5IBb69iA 5V9ZA79Yt0rFRv1prCL4nk9WK9X7MFcUTSrvZ05E4Z5eJrUwjKMx5Bp/RHjJHZl+hEhK aPYOC0fSFpNXs28fBasRnnr8Efy2kffkkrXB7nnAo/5naK/tD1XHx8tAgLR3rEZY2bli nAPw== X-Gm-Message-State: AOAM532EMaZtcHvlH6wAdjZ6foJZI+MqaZQGs1qrARJbDVA5U096JVY3 TvzzAlNqP454Hp11FfRxk+s= X-Google-Smtp-Source: ABdhPJwFaB/JGlXT2+79VBkMVtisGqY3FGpuEbSmREXmKZgc98dtldXJpLHT6BqFvJKyHQjdOjcfTg== X-Received: by 2002:a17:906:2f07:: with SMTP id v7mr8391180eji.343.1612451960424; Thu, 04 Feb 2021 07:19:20 -0800 (PST) Received: from stitch.. ([80.71.140.73]) by smtp.gmail.com with ESMTPSA id a6sm2600001ejs.79.2021.02.04.07.19.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 07:19:19 -0800 (PST) From: Emil Renner Berthing To: linux-mmc@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 9/9] mmc: wbsd: Use new tasklet API Date: Thu, 4 Feb 2021 16:18:47 +0100 Message-Id: <20210204151847.91353-10-kernel@esmil.dk> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204151847.91353-1-kernel@esmil.dk> References: <20210204151847.91353-1-kernel@esmil.dk> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_101922_060514_F2301422 X-CRM114-Status: GOOD ( 13.39 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , Emil Renner Berthing , Alex Dubov , Aaro Koskinen , linux-kernel@vger.kernel.org, Ulf Hansson , Jaehoon Chung , Ludovic Desroches , Ben Dooks , Manuel Lauss , Pierre Ossman , Bruce Chang , Harald Welte , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This converts the driver to use the new tasklet API introduced in commit 12cc923f1ccc ("tasklet: Introduce new initialization API") Signed-off-by: Emil Renner Berthing --- drivers/mmc/host/wbsd.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index cd63ea865b77..67ecd342fe5f 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c @@ -987,9 +987,9 @@ static inline struct mmc_data *wbsd_get_data(struct wbsd_host *host) return host->mrq->cmd->data; } -static void wbsd_tasklet_card(unsigned long param) +static void wbsd_tasklet_card(struct tasklet_struct *t) { - struct wbsd_host *host = (struct wbsd_host *)param; + struct wbsd_host *host = from_tasklet(host, t, card_tasklet); u8 csr; int delay = -1; @@ -1036,9 +1036,9 @@ static void wbsd_tasklet_card(unsigned long param) mmc_detect_change(host->mmc, msecs_to_jiffies(delay)); } -static void wbsd_tasklet_fifo(unsigned long param) +static void wbsd_tasklet_fifo(struct tasklet_struct *t) { - struct wbsd_host *host = (struct wbsd_host *)param; + struct wbsd_host *host = from_tasklet(host, t, fifo_tasklet); struct mmc_data *data; spin_lock(&host->lock); @@ -1067,9 +1067,9 @@ static void wbsd_tasklet_fifo(unsigned long param) spin_unlock(&host->lock); } -static void wbsd_tasklet_crc(unsigned long param) +static void wbsd_tasklet_crc(struct tasklet_struct *t) { - struct wbsd_host *host = (struct wbsd_host *)param; + struct wbsd_host *host = from_tasklet(host, t, crc_tasklet); struct mmc_data *data; spin_lock(&host->lock); @@ -1091,9 +1091,9 @@ static void wbsd_tasklet_crc(unsigned long param) spin_unlock(&host->lock); } -static void wbsd_tasklet_timeout(unsigned long param) +static void wbsd_tasklet_timeout(struct tasklet_struct *t) { - struct wbsd_host *host = (struct wbsd_host *)param; + struct wbsd_host *host = from_tasklet(host, t, timeout_tasklet); struct mmc_data *data; spin_lock(&host->lock); @@ -1115,9 +1115,9 @@ static void wbsd_tasklet_timeout(unsigned long param) spin_unlock(&host->lock); } -static void wbsd_tasklet_finish(unsigned long param) +static void wbsd_tasklet_finish(struct tasklet_struct *t) { - struct wbsd_host *host = (struct wbsd_host *)param; + struct wbsd_host *host = from_tasklet(host, t, finish_tasklet); struct mmc_data *data; spin_lock(&host->lock); @@ -1449,16 +1449,11 @@ static int wbsd_request_irq(struct wbsd_host *host, int irq) /* * Set up tasklets. Must be done before requesting interrupt. */ - tasklet_init(&host->card_tasklet, wbsd_tasklet_card, - (unsigned long)host); - tasklet_init(&host->fifo_tasklet, wbsd_tasklet_fifo, - (unsigned long)host); - tasklet_init(&host->crc_tasklet, wbsd_tasklet_crc, - (unsigned long)host); - tasklet_init(&host->timeout_tasklet, wbsd_tasklet_timeout, - (unsigned long)host); - tasklet_init(&host->finish_tasklet, wbsd_tasklet_finish, - (unsigned long)host); + tasklet_setup(&host->card_tasklet, wbsd_tasklet_card); + tasklet_setup(&host->fifo_tasklet, wbsd_tasklet_fifo); + tasklet_setup(&host->crc_tasklet, wbsd_tasklet_crc); + tasklet_setup(&host->timeout_tasklet, wbsd_tasklet_timeout); + tasklet_setup(&host->finish_tasklet, wbsd_tasklet_finish); /* * Allocate interrupt.