Message ID | 13ba99e2578d4448fd85f516fbe328f5d05eda05.1705944943.git.u.kleine-koenig@pengutronix.de |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-33934-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2765806dyb; Mon, 22 Jan 2024 10:44:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9DZM5Nbas8p6s4Hs2anumqbVpbKjC36IWxH0YgaV8rWXNttuhRqkN/n8g0pzmIe7Svwyg X-Received: by 2002:a05:620a:5233:b0:781:5d3b:869d with SMTP id dc51-20020a05620a523300b007815d3b869dmr3981511qkb.112.1705949053901; Mon, 22 Jan 2024 10:44:13 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705949053; cv=pass; d=google.com; s=arc-20160816; b=abxo36UBNyjVu71Nn6HVJRAVPsT6YSg45gdb8DPw9jRUy/EHl4v8UaoD4J5WVX9mkj cSOeVXG6oaLM3xP41i4lwPX4cwVrPraBBzALF4ZaUQmFtzNqikDuSGXrCMN7pmYB6vPZ iSK4xlDJ5nlJC+ftVGyvSaAPO5KeBjc8nMT1ZGSPY34drabLW6uQpgS2Nn0Jno62Qnxv ih6X/luTZdIHjlTYoim+lkciXN6j9sk90wTOol3bsx9k1Orp1yQVcPU486Xo9jI1v5TI 9Wb8orF1fW20N6N4u1X6Y2fjZ/7vd3gNh2O9iIJiFr49Za56Eg4cvyFaVpJSfWpgJqIb yqkA== 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=9hxsc9MrevZ4KT4GT35OEc+YqH1LPs9/4VQTR2gYr8o=; fh=0fytlGeee0VeAh3YwYgMjDq1lYdbyV7hNKyaNGPk5/U=; b=LahJcQuTLlACeV5MKmkgPjkC4nDPki63nJbNHmc1qDasOS0/P0d0Tahu90rT/QNpAI 4E963DhZKJH3KMXFSEARB9kcHPDf4U6iaWArxJeJ7b2RGIxro6oHsfHvSuPGsrHoWgEC 6gwgFBXZWQIH5mTlKZgCOXu3L9lS0Zl1tljIkUcui68u6S2ZWbo1Ee9ue9yl0uhCBacy gWP3eD2YEtt41QcBO3k7qwPJVM30i3gzv1lCCvWUs2gdSGtPI9DJm82CfOeKuPjj21eT 49G1b3bv0VnKgThaJ5mlr2YPa0DEylQCcqL8mGTUjYBbOetnBWvIEBmIJZ2LprQ698qY pluA== 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-33934-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33934-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id b25-20020a05620a089900b0078356099d21si5888335qka.390.2024.01.22.10.44.13 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Jan 2024 10:44:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-33934-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=pengutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-33934-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-33934-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id AEB191C28A37 for <ouuuleilei@gmail.com>; Mon, 22 Jan 2024 18:44:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 65CB864A99; Mon, 22 Jan 2024 18:08:39 +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 E2DDA60EC4 for <linux-kernel@vger.kernel.org>; Mon, 22 Jan 2024 18:08:31 +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=1705946914; cv=none; b=P6fZfsaHmUKCYsr3SFhirUtH+DKXz2Kkl1IDGzR/9pnmexMpCb1ypmmhmOeNMX4B7FqmSDmTh/WmzN5TTIfPSLgNe/ncbfascYUuMUs3StJhr2Leih6XpMPVEG46Ah/ryQaAZRdaVVqEZV4JzZ68Mfjc1wfTc93qaKH8zP21X54= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946914; c=relaxed/simple; bh=RZvYfTlU/4VH1OArpbwo3y/uz1FTbk44tCVZsUBiwns=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=JhBey6lOPcak362hnyOwVgkvChFhr7euTAXBJ7Rjo/DkPUIJktzd9bWIgCtVybv48/G9lJML25sJ8C7xP78Exq38qP5TwiLnSsur+cTPcYDf+1VgJCl/kEauzRP4mahEVt7/DoV88LLxgmepvJr694ge8YE97tupUMwRm5Am1Bg= 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 <ukl@pengutronix.de>) id 1rRyiV-0001q8-HH; Mon, 22 Jan 2024 19:08:15 +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 <ukl@pengutronix.de>) id 1rRyiV-001ePq-0v; Mon, 22 Jan 2024 19:08:15 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from <ukl@pengutronix.de>) id 1rRyiU-005ZxR-33; Mon, 22 Jan 2024 19:08:14 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Mark Brown <broonie@kernel.org> Cc: kernel@pengutronix.de, Ulf Hansson <ulf.hansson@linaro.org>, Andy Shevchenko <andriy.shevchenko@linux.intel.com>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Yang Yingliang <yangyingliang@huawei.com>, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org Subject: [PATCH v2 11/33] mmc: mmc_spi: Follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:07:06 +0100 Message-ID: <13ba99e2578d4448fd85f516fbe328f5d05eda05.1705944943.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <cover.1705944943.git.u.kleine-koenig@pengutronix.de> References: <cover.1705944943.git.u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Developer-Signature: v=1; a=openpgp-sha256; l=1575; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=RZvYfTlU/4VH1OArpbwo3y/uz1FTbk44tCVZsUBiwns=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7PRw7TChDVEykUOUq5M7YoRpsevn+zMTYJs hN9mKylAViJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6uzwAKCRCPgPtYfRL+ TiN0B/wOu1KLBD9+KdV1G22LTlGmGCJ+mdVJ2VljDSCHlKk6wX+Xlfg9aNuMzu7NuiQBYi+k6kF 2ooN3LdUgNfSWMdMl4uh5UloS99FziZ3YZ5YYLvcffLhCT6E57IWNB9/bD7RfxQ/24u//kf7Bqr j7IUqPWyPUX+K5JIfQSNQTI5NI1Rgbd51gjdAzphXn5of6QD+bOUSffOiP7APFcgDatPQ0Zbq3S grvQjUAMI7kiZWF421cO22SoVODsu6hnVMpjTF2RRNXl+YCg6TL8mSIqcYlYDurIZKJLu3/7bIS Hk3q4BnvSgHvKxVwmP9oovvhCAGCmOLZ+d5Qacoljqigp9j1 X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: 8bit 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: 1788817235068818198 X-GMAIL-MSGID: 1788817235068818198 |
Series |
spi: get rid of some legacy macros
|
|
Commit Message
Uwe Kleine-König
Jan. 22, 2024, 6:07 p.m. UTC
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.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/mmc/host/mmc_spi.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
Comments
On Mon, 22 Jan 2024 at 19:08, Uwe Kleine-König <u.kleine-koenig@pengutronix.de> wrote: > > 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. > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> It looks like we need a decision if this should go via Mark's tree, the series altogether - or if each subsystem maintainer should apply each patch separately and postpone the final cleanups. While waiting for a conclusion, here's my ack. Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Kind regards Uffe > --- > 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 > -- > 2.43.0 >
On Tue, Jan 23, 2024 at 02:09:42PM +0100, Ulf Hansson wrote: > It looks like we need a decision if this should go via Mark's tree, > the series altogether - or if each subsystem maintainer should apply > each patch separately and postpone the final cleanups. > While waiting for a conclusion, here's my ack. As far as I'm concerned at this point it's going via my tree, I've got it queued for -rc3.
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