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);