From patchwork Sat Feb 10 16:40:06 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: 772012 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 58B405C5E8 for ; Sat, 10 Feb 2024 16:40:48 +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=1707583249; cv=none; b=oJgpL5vGYFnnbaU1thROnrObF/PoEdfxZ3GVq5jeWKFsOmH+JHu2W3FWrYWNU8dX0hbRo08rJ6Xmb0v/RWSmsS23xgNQa+Xz3URsbG6tX1u4wsYPPB2mjPzdRy3t9zd3VBqR4QcZieZJpmXzEG57ix2uAaPPkF8+gn9IFCdBvig= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707583249; c=relaxed/simple; bh=zxnkSjU8zgg5ZUmhJtmpcwisYsjJs7ecC4KVxXBlVv0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QOaQXlQoTLZ1XuNRTVaGOEOnZEV1FPTskTxlQegQBYuxvTL4Et3pY9pRuCONrehjVUMF6yX3+d26dyvrNSb5OpNJhqzPVcBh6Ax2Kk5hzQW49k9VuoPE5Yfwp2XdgLBASadexFIY9FQZ13iRc/h4eb5UcoUhr89O01UtxRxRGDA= 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 1rYqOs-0001I9-Pk; Sat, 10 Feb 2024 17:40:22 +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 1rYqOq-005i47-L7; Sat, 10 Feb 2024 17:40:20 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rYqOq-002ER7-1p; Sat, 10 Feb 2024 17:40:20 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Rob Herring , H Hartley Sweeten , Jonathan Cameron , Stephen Warren , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] spi: ppc4xx: Fix fallout from include cleanup Date: Sat, 10 Feb 2024 17:40:06 +0100 Message-ID: <20240210164006.208149-6-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240210164006.208149-5-u.kleine-koenig@pengutronix.de> References: <20240210164006.208149-5-u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=846; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=zxnkSjU8zgg5ZUmhJtmpcwisYsjJs7ecC4KVxXBlVv0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlx6bne49I0C7mT2sVPnGiyLzjcN+/ccr00u0TY K8GCKbq1XKJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcem5wAKCRCPgPtYfRL+ TrdaB/4rSPzpBWOEz6E+zsmujs4yigrklb06Mhmpmd2UGYGCicl0nJvdDPvmqm/zCC0offJN/Qo zWR7v9EmBqoLM5e/nmWWGOwl01qVp75ZMJ7ialpK6QwuPUMjyeqk2ep3CJLHosr5DwNQ1H8gaDU DQqCZmnW7/CBSwIeX0aFNj8BSPYJInkqOSJSMqW1jbAmd1oeqPYWhRCGTJ0GauFaKu1j/tN9XND f17x7EXQuI7/b4tk/uz+ZKykixoJXG7vLkGCS0NQX5b4rNzvk73sm3iXIgI4s4yNjMC/3zCpiOU d5UjhhA+V5LPHjD71G/eDAzi6zIBVz5XK5tQPt+7aQXdV7Wm 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-spi@vger.kernel.org The driver uses several symbols declared in , e.g module_platform_driver(). Include this header explicitly now that doesn't include any more. Fixes: ef175b29a242 ("of: Stop circularly including of_device.h and of_platform.h") Signed-off-by: Uwe Kleine-König --- drivers/spi/spi-ppc4xx.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 412d6e678224..2290b40459ef 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include From patchwork Sat Feb 10 16:40:07 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: 772011 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 58B0053815 for ; Sat, 10 Feb 2024 16:40:48 +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=1707583249; cv=none; b=KcySH49mTPmykkZp6loNHLgSvoF1EQPR9sbK2XUqw8w6p62PKJbBbNRLN+IMsXywW+vm1vcodf+Z+rgO1ZS0u4hIEud4bKm+umGUObntdQv3M4oQZQ1KSiahBnvHHULoq0khgLnE7RoWsp4Fl8DlC5Vb/Ge63qidcDFDlIdG1gU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707583249; c=relaxed/simple; bh=CscG4XnYZ8gB9jKhA67cDKdK7kHCrNVWFAz8jn8AnuU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=RlO80km1krpdTOD8xX9kiB0CbxM1KC1Lo1D81KR3c6w+WzXWXydVcmeJs3k8uI/Dy3lN4ew7FbRxIijU9QrYOlUaUjMJTte91BlIbYIdW0lzYCnQDt47BTMJpHKBwCrrUOrx4MbtokHn+Dk/h4Qzjy8bTlXtkHe4qt87AqEU+jk= 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 1rYqOt-0001IA-CA; Sat, 10 Feb 2024 17:40:23 +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 1rYqOq-005i4A-RJ; Sat, 10 Feb 2024 17:40:20 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rYqOq-002ERB-2S; Sat, 10 Feb 2024 17:40:20 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Rob Herring , H Hartley Sweeten , Jonathan Cameron , Stephen Warren , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org, kernel test robot Subject: [PATCH 2/3] spi: ppc4xx: Fix fallout from rename in struct spi_bitbang Date: Sat, 10 Feb 2024 17:40:07 +0100 Message-ID: <20240210164006.208149-7-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240210164006.208149-5-u.kleine-koenig@pengutronix.de> References: <20240210164006.208149-5-u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1827; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=CscG4XnYZ8gB9jKhA67cDKdK7kHCrNVWFAz8jn8AnuU=; b=owGbwMvMwMXY3/A7olbonx/jabUkhtTjy15sdrJY9F8jIO+Kaaan0NOrB2xWBTr4/95UcFTOh JfFZt+5TkZjFgZGLgZZMUUW+8Y1mVZVcpGda/9dhhnEygQyhYGLUwAm0v2P/X/MGgUFI9ZodhFJ fU2vSK+abYtF5jtV+9/5f7bMWWXXht99awwil9p0hPjNqKxiUMnn4L/mKDA34Mn3NP8g+17Pu71 lWzZsFOCOj9sr+nHS2euG+WLO+qHeXz4Wx9SLyT1SSVt3QlS32k3/p49a7+xZr+8v5mjillqmeC znvMW/dlbtyJV1yT3yz7gyZrx9x1YSyP49t2SBgMx3E+aqXQ93CxW+ut6zLv3XrNMdpVKNzmev9 YpmXOk38d59Y8OrS5Enn8krHLLocj+0Y/d5sbt/21exnnlqeNz35YtDbVIMLm/aZuxuOnN/AUek Plf6lZ/uMhbi6z2DHC5rZhiruiyc9srR6LaNHrcdX0YKAA== 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-spi@vger.kernel.org I failed to adapt this driver because it's not enabled in a powerpc allmodconfig build and also wasn't hit by my grep expertise. Fix accordingly. Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202402100815.XQXw9XCF-lkp@intel.com/ Fixes: 2259233110d9 ("spi: bitbang: Follow renaming of SPI "master" to "controller"") Signed-off-by: Uwe Kleine-König --- drivers/spi/spi-ppc4xx.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 2290b40459ef..2d5536efa9f8 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c @@ -364,22 +364,22 @@ static int spi_ppc4xx_of_probe(struct platform_device *op) /* Setup the state for the bitbang driver */ bbp = &hw->bitbang; - bbp->master = hw->host; + bbp->ctlr = hw->host; bbp->setup_transfer = spi_ppc4xx_setupxfer; bbp->txrx_bufs = spi_ppc4xx_txrx; bbp->use_dma = 0; - bbp->master->setup = spi_ppc4xx_setup; - bbp->master->cleanup = spi_ppc4xx_cleanup; - bbp->master->bits_per_word_mask = SPI_BPW_MASK(8); - bbp->master->use_gpio_descriptors = true; + bbp->ctlr->setup = spi_ppc4xx_setup; + bbp->ctlr->cleanup = spi_ppc4xx_cleanup; + bbp->ctlr->bits_per_word_mask = SPI_BPW_MASK(8); + bbp->ctlr->use_gpio_descriptors = true; /* * The SPI core will count the number of GPIO descriptors to figure * out the number of chip selects available on the platform. */ - bbp->master->num_chipselect = 0; + bbp->ctlr->num_chipselect = 0; /* the spi->mode bits understood by this driver: */ - bbp->master->mode_bits = + bbp->ctlr->mode_bits = SPI_CPHA | SPI_CPOL | SPI_CS_HIGH | SPI_LSB_FIRST; /* Get the clock for the OPB */ From patchwork Sat Feb 10 16:40:08 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: 771768 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 58B6A5C8ED for ; Sat, 10 Feb 2024 16:40:48 +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=1707583249; cv=none; b=lbNc/iiejETCGg3lD4xUZuRx0FFms8eHpsqGXRcNqPinqSahXOXCJkoElCCCynyxPIt/ty5VPxw9u8TGdked5UNUFP6ixfkfZKD+bcLIk5melOB69MZ1z6Dyizz2JONmbrlGsw1iog/yoWSmHdFLAAqo9kQ/pA7/AORZpFzClos= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707583249; c=relaxed/simple; bh=10BznG4/Q7I4p/NCADVIk4BSO8uNoZg982rmmdanDP0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rZ4JNLjP8btigwj/JxIIeCzyH/sqCuSbYv7mxVAvU3ajYQd8xykWTV6ApgoDD6V78sKM+Whg6XdnTnnEm0Fr7SuvLg7fdnTYe2ey0a2v3wg9qYdYzGPZ1pE6jGllfzAvqTfJtc6VLXPpCu3LezTSkHBnfMVnEbdVOedtM2V/8P4= 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 1rYqOs-0001IB-Pk; Sat, 10 Feb 2024 17:40:22 +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 1rYqOr-005i4D-24; Sat, 10 Feb 2024 17:40:21 +0100 Received: from ukl by ptz.office.stw.pengutronix.de with local (Exim 4.96) (envelope-from ) id 1rYqOq-002ERK-39; Sat, 10 Feb 2024 17:40:20 +0100 From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= To: Mark Brown Cc: kernel@pengutronix.de, Rob Herring , H Hartley Sweeten , Jonathan Cameron , Stephen Warren , linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] spi: ppc4xx: Drop write-only variable Date: Sat, 10 Feb 2024 17:40:08 +0100 Message-ID: <20240210164006.208149-8-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240210164006.208149-5-u.kleine-koenig@pengutronix.de> References: <20240210164006.208149-5-u.kleine-koenig@pengutronix.de> Precedence: bulk X-Mailing-List: linux-spi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1352; i=u.kleine-koenig@pengutronix.de; h=from:subject; bh=10BznG4/Q7I4p/NCADVIk4BSO8uNoZg982rmmdanDP0=; b=owEBbQGS/pANAwAKAY+A+1h9Ev5OAcsmYgBlx6bqu4OIok6KAOl5u5CmjU5gQ1LXdKCj/lzYj wmW21P1rXyJATMEAAEKAB0WIQQ/gaxpOnoeWYmt/tOPgPtYfRL+TgUCZcem6gAKCRCPgPtYfRL+ TiX/B/0cEuFK96ul4c/xZ283WZaBg1+kQ8qA0NWUk4lAxw8d7kjNPCAPuFc2sjFLD9zCleMGM/n /hhyCohFXxk4PAXOjzGKr+6x1odZwO3MbpAOrbFeKgx8F/WrVqyYiNMOwvtSmdkpZm96prEfnKi fhymfBMG1uicbzKhb6HVDfopsENqmDPsyotwUZoAulJAc9KyrQUGL/eYyxzWymRSC+pqhnZvzU0 b1eP0z8Kj+yw6t2kY5Tp5HkNnN0iOpKD0Xf1usiJyWnzr6Qw0meRbf82NNoxrOXm7hc0aj9VGI6 qVJ72xnijJQTyl8c5n0MJcUDDla22i2eXV3LjVcdoQApBZ9L 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-spi@vger.kernel.org Since commit 24778be20f87 ("spi: convert drivers to use bits_per_word_mask") the bits_per_word variable is only written to. The check that was there before isn't needed any more as the spi core ensures that only 8 bit transfers are used, so the variable can go away together with all assignments to it. Fixes: 24778be20f87 ("spi: convert drivers to use bits_per_word_mask") Signed-off-by: Uwe Kleine-König --- drivers/spi/spi-ppc4xx.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/spi/spi-ppc4xx.c b/drivers/spi/spi-ppc4xx.c index 2d5536efa9f8..942c3117ab3a 100644 --- a/drivers/spi/spi-ppc4xx.c +++ b/drivers/spi/spi-ppc4xx.c @@ -168,10 +168,8 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t) int scr; u8 cdm = 0; u32 speed; - u8 bits_per_word; /* Start with the generic configuration for this device. */ - bits_per_word = spi->bits_per_word; speed = spi->max_speed_hz; /* @@ -179,9 +177,6 @@ static int spi_ppc4xx_setupxfer(struct spi_device *spi, struct spi_transfer *t) * the transfer to overwrite the generic configuration with zeros. */ if (t) { - if (t->bits_per_word) - bits_per_word = t->bits_per_word; - if (t->speed_hz) speed = min(t->speed_hz, spi->max_speed_hz); }