From patchwork Wed Feb 7 18:40:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 198070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2439783dyb; Wed, 7 Feb 2024 10:58:42 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWzsU/YPkqD5+9xPJdBrSQJdOs1pzLkkw3tn/bJSI7c4PLB7fjhRmM45uS3niSCiTdWI00Wqy6NFR4bBPtyl/I0hkucgA== X-Google-Smtp-Source: AGHT+IGqki6iMrGnQxdrTJUliEyWNHrRNh6Ieir2f52Iyn4SuB0HVRuGeoJsInGfZlbJrHX6CKc7 X-Received: by 2002:a05:6870:7251:b0:218:7643:26cf with SMTP id y17-20020a056870725100b00218764326cfmr7029912oaf.10.1707332321851; Wed, 07 Feb 2024 10:58:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707332321; cv=pass; d=google.com; s=arc-20160816; b=kyvqPlGVRwDRGR/2EHqUdvCc4xx7ch6vdfxhOEvh6i9mA6rIUGTvNSm0nVe4LXtoZu S2nFjzdcuSBKAOlhnqrDgSuqIL5TDEtuUBD+cbuSlTppB2MPIlqtvnzERB0OYP75Hd/L eV97B/R99w3x8IiBBhef3aJC5s7NLhlVEkyybkySehOe4MWloYI8btYGq7j4EnBrW3wZ u1do6d0dB/aJD7KzY/aWw816Tn2bDP1Ldk5gIBa1WlDnufwkispSPJcAu6jKBBJ97sSn Rk1q62GHGj78GlL14wTm+Bk4N7lSGDNESfzchyDuwUWyxAS0EautLx0Q7iyOcPjCjVWI RvDw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=RXzDCIZT22ze1kGisWvx4zVJff27H60h2z2Ym7yKOZ8=; fh=Ffn5wRod/v7ufWHHkRgYNVbVHdATD78P+/GELBFKniE=; b=GRWNkrYnHPbCubn3XP65EpGsT7wKZZZvzxbDqWgk3nLFNptto09OWddWhhkjZHkFXr vXH0Go8oEf0G4y6tGQm722PwHvmAhq2avFttkjuAInFcHrxVLUuIKap33TOYGCOiy6lx 5FhkyznO1WlVdLdCjzuy1TYAMFIRWXBsnhYqyAd+ZmX+xOTcXIn93GTwCYtTJu8T5HL5 BAPky3tuO1lQ36H8PIMQ9OmWIYOIcGNojQISFQxLdGEaOxgk0vOoM55xOzE9nGRNJEkI VaMQ1kEbke6t//jm8kpnqexzMr69Rf18y9r4NVEZ8fkofJXRaifCRsAWT494WxQiEmbF wCuA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56950-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56950-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCVbC31bcU6KstYasj/jDFlYefCNTvHnGaJP7EBzJEsXoFXhvgtv+AGRe2/N2AhDbciYgY5VDPOnjGh14Pjfzpf0URHQTA== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id 83-20020a630056000000b005d8b481c4e3si1964964pga.213.2024.02.07.10.58.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 10:58:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56950-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-56950-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56950-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 58120B20F3D for ; Wed, 7 Feb 2024 18:51:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3A58013A26F; Wed, 7 Feb 2024 18:43:40 +0000 (UTC) Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9979A12C533 for ; Wed, 7 Feb 2024 18:43:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331412; cv=none; b=hd94cV26mgky/o8H+Zmrt5BSSrdxtdI20ZUQJxEpDJCsElQ5fAzlbsUUt5hcCvJcJbJ930er2GURBfZOf9Nqr6boFNQ/IajXqxp2zvOF1VCdQAMWFeB7S4evkbZZtrrUb6RwL5w5QApd9isbttelPwweibQ9Fv7aL8VNeUeCmTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707331412; c=relaxed/simple; bh=3uWg1dj8JY2x4YbDK4pPCpaqGziQ38xKtIysd488qoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bf2JtJyqg4In7xL4fWz6SEJs7PFdfOafBVRRiYNz5ZlHHCe2HWrhx9ZZDKpafl0S/1CnBJ754/s7Up1ehx2pA+CC8Q2IwMgc4EojiWVZk2y60/Go1Fh0Wg9AbuckvWFOO3asZ29nOjFeWK5Fu6welGRiliFShJxlOKS9a7wwpvw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rXmt5-0007Sd-Gt; Wed, 07 Feb 2024 19:43:11 +0100 Received: from [2a0a:edc0:0:900:1d::77] (helo=ptz.office.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1rXmt4-0054XU-TT; Wed, 07 Feb 2024 19:43:10 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rXmt4-00HRsU-2e; Wed, 07 Feb 2024 19:43:10 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Ulf Hansson , Andy Shevchenko , Greg Kroah-Hartman , Jonathan Cameron , Yang Yingliang , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 11/32] mmc: mmc_spi: Follow renaming of SPI "master" to "controller" Date: Wed, 7 Feb 2024 19:40:25 +0100 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1681; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=3uWg1dj8JY2x4YbDK4pPCpaqGziQ38xKtIysd488qoY=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlw86iRgaXsnAONPwKcmuWcccjOTtI4N+LZaa3r vFnNuQq3YeJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcPOogAKCRCPgPtYfRL+ TuGiB/4q83A3nbw2iRt8SUETQFwrm/YEhFpxFYwZ1pvftS7tqTK4D+okPck/OcXlQTFGX06Zcpl AYSRQUlRCEfjgyOn1yC3CYsT3dLPS879Y63xknQy3AiEOuTH7V20cldVljtwQV5YftBbugq28xn y/HUZhpyefhnnvbpca7Ghu+CtTg+8BeGDUelSW7vylKSdShiFD7F6Le6OIEwjrAny2SIN6194qo g1mSV9BD7CepqbONlfsGdqc9QDqDm7S5TsHNTyxSIMS4OiQPWfxNrRaVt3P4lYKAaLs0wrJHhMa nkUh9TPQj6RN6+KHZ75lTA3ym06Wxqrwls28Uryyx8FrseF5 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790267696949675905 X-GMAIL-MSGID: 1790267696949675905 In commit 8caab75fd2c2 ("spi: Generalize SPI "master" to "controller"") some functions and struct members were renamed. To not break all drivers compatibility macros were provided. To be able to remove these compatibility macros push the renaming into this driver. Acked-by: Ulf Hansson Acked-by: Jonathan Cameron Signed-off-by: Uwe Kleine-König --- drivers/mmc/host/mmc_spi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index b8dda8160c4e..bf35761f783a 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c @@ -935,7 +935,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq) #endif /* request exclusive bus access */ - spi_bus_lock(host->spi->master); + spi_bus_lock(host->spi->controller); crc_recover: /* issue command; then optionally data and stop */ @@ -967,7 +967,7 @@ static void mmc_spi_request(struct mmc_host *mmc, struct mmc_request *mrq) } /* release the bus */ - spi_bus_unlock(host->spi->master); + spi_bus_unlock(host->spi->controller); mmc_request_done(host->mmc, mrq); } @@ -1157,7 +1157,7 @@ static int mmc_spi_probe(struct spi_device *spi) /* We rely on full duplex transfers, mostly to reduce * per-transfer overheads (by making fewer transfers). */ - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) return -EINVAL; /* MMC and SD specs only seem to care that sampling is on the