From nobody Fri Sep 20 05:45:02 2024 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 1F7E660255 for ; Mon, 22 Jan 2024 18:08:25 +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=1705946906; cv=none; b=HBkFlBK4xu+DTCVcFtlVKGRkDf6Iypb7h60SD+cibJ1Jwrux1WgRLPBE1YEQv+HJfY4g2MZ/d0uEmMzEj2w2wKp66VTjVmzKHnHjytr07DzA56X8ey+Cqc0vJKiJHAk/n3Mc7opt8jPEywiIKD3+uM89mBq1OXUijxBrHl+47TY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705946906; c=relaxed/simple; bh=1r57n6pCaby+lv1DE7k3IDX2x7vIaMkEPVZWkUjss+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jVi4TeT2kIETkUtHbnPnAy1ClJCvl0HsXrnFi+LR33+M36DBgu5An8YUmzmg12anM8y01C9TNK9rFgpk+CnNXEHUfW792lyc1ne5Zm1uAYnaMW8AP5GHAFDUN0bc5owic8OdsupJIjLgBWx5BsNTA4jdK8VkD8kem7iYlFDp4mU= 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 1rRyiZ-00028N-LB; Mon, 22 Jan 2024 19:08:19 +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 1rRyiZ-001eRB-1o; Mon, 22 Jan 2024 19:08:19 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rRyiY-005Zyt-3A; Mon, 22 Jan 2024 19:08:18 +0100 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 31/33] spi: fsl-lib: Follow renaming of SPI "master" to "controller" Date: Mon, 22 Jan 2024 19:07:26 +0100 Message-ID: <1a82f797d8362fe7bf7b876bfcfc0fb5b65b1be0.1705944943.git.u.kleine-koenig@pengutronix.de> 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 Content-Type: text/plain; charset="utf-8" X-Developer-Signature: v=1; a=openpgp-sha256; l=1854; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=1r57n6pCaby+lv1DE7k3IDX2x7vIaMkEPVZWkUjss+U=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlrq7nvzm68uTfzLJCoOEslXrl5nkgaUSS1TySW BgtYWIlXt6JATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZa6u5wAKCRCPgPtYfRL+ TnhqB/98DHksZKV63AtdaFl/zmOZ3gSu8WEoJwTELMSowC+9S0JwTJUhSWc2pJQbD1/eWRT7K6J zYE7/7XzbJ3rcuThlDb60bubSUxMlunbW5jE6ox9Q8BdyJwTcPHSk4+ZlMJR8RFEGmrtMnMGCHM aG0pTQNy196Ljl18UahYkcrWePxYpQ08kJqJ4wC6qrlEdP48bDL6PUk5l+797BAfi5rXPvk46BP xAKq2S2xF6p4F4g3IpyYg0oi/YFfLOVRTf5rxfdA6uKCXXLrQa9X31BESTN0qM0iD7E0vTekz8X e+0RqmT631Jj0ZtEaF90Hn6RKqsUH/sGfBEDB0TO+jFEz5d/ X-Developer-Key: i=u.kleine-koenig@pengutronix.de; a=openpgp; fpr=0D2511F322BFAB1C1580266BE2DCDD9132669BD6 Content-Transfer-Encoding: quoted-printable 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 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=C3=B6nig --- drivers/spi/spi-fsl-lib.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-fsl-lib.c b/drivers/spi/spi-fsl-lib.c index 885757c29fbb..4fc2c56555b5 100644 --- a/drivers/spi/spi-fsl-lib.c +++ b/drivers/spi/spi-fsl-lib.c @@ -82,18 +82,18 @@ void mpc8xxx_spi_probe(struct device *dev, struct resou= rce *mem, unsigned int irq) { struct fsl_spi_platform_data *pdata =3D dev_get_platdata(dev); - struct spi_master *master; + struct spi_controller *ctlr; struct mpc8xxx_spi *mpc8xxx_spi; =20 - master =3D dev_get_drvdata(dev); + ctlr =3D dev_get_drvdata(dev); =20 /* the spi->mode bits understood by this driver: */ - master->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_CS_HIGH + ctlr->mode_bits =3D SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST | SPI_LOOP; =20 - master->dev.of_node =3D dev->of_node; + ctlr->dev.of_node =3D dev->of_node; =20 - mpc8xxx_spi =3D spi_master_get_devdata(master); + mpc8xxx_spi =3D spi_controller_get_devdata(ctlr); mpc8xxx_spi->dev =3D dev; mpc8xxx_spi->get_rx =3D mpc8xxx_spi_rx_buf_u8; mpc8xxx_spi->get_tx =3D mpc8xxx_spi_tx_buf_u8; @@ -104,8 +104,8 @@ void mpc8xxx_spi_probe(struct device *dev, struct resou= rce *mem, mpc8xxx_spi->rx_shift =3D 0; mpc8xxx_spi->tx_shift =3D 0; =20 - master->bus_num =3D pdata->bus_num; - master->num_chipselect =3D pdata->max_chipselect; + ctlr->bus_num =3D pdata->bus_num; + ctlr->num_chipselect =3D pdata->max_chipselect; =20 init_completion(&mpc8xxx_spi->done); } --=20 2.43.0