From patchwork Mon Jan 15 20:12:50 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: 13520126 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 6AC7718C08 for ; Mon, 15 Jan 2024 20:21:13 +0000 (UTC) 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 1rPTSD-0004fz-Ve; Mon, 15 Jan 2024 21:21:05 +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 1rPTSD-0005g8-Ic; Mon, 15 Jan 2024 21:21:05 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rPTSD-000N7J-1a; Mon, 15 Jan 2024 21:21:05 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown , Geert Uytterhoeven Cc: linux-spi@vger.kernel.org, kernel@pengutronix.de, Dmitry Torokhov , linux-input@vger.kernel.org Subject: [PATCH 04/33] Input: pxspad - follow renaming of SPI "master" to "controller" Date: Mon, 15 Jan 2024 21:12:50 +0100 Message-ID: <5e05e8f918ba1f026b9967b0aaff5403a35cbf13.1705348269.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1080; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=GBiDbTv4I8SusnZruVIRNdgTUy9UKrF5KoYuPLnKuME=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlpZHFMTn39PajEktNiUDzev913UA/1Q2crqck7 J6AuwTTOLOJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZaWRxQAKCRCPgPtYfRL+ TvUMB/0Y3lPe5wsQdiPSrJuDJcJiv/O7gL3o1T7GFQm2iQSpSL1A7BNk3INW8nRQ5CUnGad6SES N0WkbrKxKhkzFUESVvQT/kTi8/5WixTceU3MBgiDjxEMWD+x9wRDn158cQV/+HdP0HWaHaNEKqd 9U5IC+5mycpOdgYfL9GYSwlsgmWFL+BhR9gwmF65DtKcFa0NArGTQ3sfcLt4xPYPPKa3mbi/x43 baAe34n5A+RUfL1xEhB6coHzrsYBPxBUDi5z5HOkTbzdt5nA/TLIKsEXBX+3e2VXFVw1Px2j1NC PAMkpCnoUj91GwnApRfjiqJ8IIvU6NCPKvj2O3Qk4vzVENTF 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-input@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önig Acked-by: Dmitry Torokhov --- drivers/input/joystick/psxpad-spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/input/joystick/psxpad-spi.c b/drivers/input/joystick/psxpad-spi.c index de734a927b4d..c47fc5f34bd0 100644 --- a/drivers/input/joystick/psxpad-spi.c +++ b/drivers/input/joystick/psxpad-spi.c @@ -342,8 +342,8 @@ static int psxpad_spi_probe(struct spi_device *spi) spi->mode = SPI_MODE_3; spi->bits_per_word = 8; /* (PlayStation 1/2 joypad might be possible works 250kHz/500kHz) */ - spi->master->min_speed_hz = 125000; - spi->master->max_speed_hz = 125000; + spi->controller->min_speed_hz = 125000; + spi->controller->max_speed_hz = 125000; spi_setup(spi); /* pad settings */ From patchwork Mon Jan 15 20:12:51 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: 13520127 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 509B11AAC2 for ; Mon, 15 Jan 2024 20:21:27 +0000 (UTC) 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 1rPTSH-0004gC-3u; Mon, 15 Jan 2024 21:21:09 +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 1rPTSD-0005gB-Pw; Mon, 15 Jan 2024 21:21:05 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rPTSD-000N7N-2H; Mon, 15 Jan 2024 21:21:05 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown , Geert Uytterhoeven Cc: linux-spi@vger.kernel.org, kernel@pengutronix.de, Dmitry Torokhov , Ulf Hansson , Greg Kroah-Hartman , Rayyan Ansari , Andy Shevchenko , Jonathan Cameron , linux-input@vger.kernel.org Subject: [PATCH 05/33] Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" Date: Mon, 15 Jan 2024 21:12:51 +0100 Message-ID: <5257de51fe406cf8405310dd638f648a232f4a6c.1705348269.git.u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-input@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=999; i=u.kleine-koenig@pengutronix.de; h=from:subject:message-id; bh=xNp8+Dfm+EIe+qXYL7ffoOmuQD29EViiqqJIkWTp+/8=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlpZHGUROwY7gSiKhm7vFe2LyN7SMEhrw3gqNEL piBfFQsIniJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZaWRxgAKCRCPgPtYfRL+ TshGB/9ZWGcAkrqhB576nUPfyFxO90rCudqYonICFb2n0+G/zFvYxfnkeW4KrrsxqCDQDoIZREc eyVeqJTgJbTmC3B4sopiiiFBW8jlcMSAqwoegk9rGvgPBMmDYtaJKCoqwzqZzr/4tWCFMDZN3XU v2v7Mub7Vox5ZHFRHae0o9CIkLTG0J1eC+ZyEXeOjqb5oQiC9bVqUKC4dFf1tbqOihLePWqpPnt a0jnH51QZfKqApTwjr7n1+pezYMyVHxYnjT8Gyu9c0h+DXx0d2gmaZhYlWa6LjbDThGnf0cPAGL BxAtCTa/HjFDzJwv51K2T9sUjV0+IADBXe7SzLWokKrkL3e5 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-input@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önig Acked-by: Dmitry Torokhov --- drivers/input/rmi4/rmi_spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/input/rmi4/rmi_spi.c b/drivers/input/rmi4/rmi_spi.c index 07c866f42296..9d92129aa432 100644 --- a/drivers/input/rmi4/rmi_spi.c +++ b/drivers/input/rmi4/rmi_spi.c @@ -375,7 +375,7 @@ static int rmi_spi_probe(struct spi_device *spi) struct rmi_device_platform_data *spi_pdata = spi->dev.platform_data; int error; - if (spi->master->flags & SPI_CONTROLLER_HALF_DUPLEX) + if (spi->controller->flags & SPI_CONTROLLER_HALF_DUPLEX) return -EINVAL; rmi_spi = devm_kzalloc(&spi->dev, sizeof(struct rmi_spi_xport),