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)