[PATCH v3 00/32] spi: get rid of some legacy macros
Changes since v2 (https://lore.kernel.org/linux-spi/cover.1705944943.git.u.kleine-koenig@pengu...):
- Drop patch "mtd: rawnand: fsl_elbc: Let .probe retry if local bus is missing" which doesn't belong into this series. - Fix a build failure noticed by the kernel build bot in drivers/spi/spi-au1550.c. (I failed to catch this because this driver is mips only, but not enabled in a mips allmodconfig. That's a bit unfortunate, but not easily fixable.) - Add the Reviewed-by: and Acked-by: tags I received for v2.
Mark already announced for v2 that he is willing to apply the whole series to his spi tree. Assuming no other show stoper are found in this v3, I assume that's the plan still for this series now.
Thanks Uwe
Uwe Kleine-König (32): fpga: ice40-spi: Follow renaming of SPI "master" to "controller" ieee802154: ca8210: Follow renaming of SPI "master" to "controller" iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" Input: pxspad - follow renaming of SPI "master" to "controller" Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" media: mgb4: Follow renaming of SPI "master" to "controller" media: netup_unidvb: Follow renaming of SPI "master" to "controller" media: usb/msi2500: Follow renaming of SPI "master" to "controller" media: v4l2-subdev: Follow renaming of SPI "master" to "controller" misc: gehc-achc: Follow renaming of SPI "master" to "controller" mmc: mmc_spi: Follow renaming of SPI "master" to "controller" mtd: dataflash: Follow renaming of SPI "master" to "controller" net: ks8851: Follow renaming of SPI "master" to "controller" net: vertexcom: mse102x: Follow renaming of SPI "master" to "controller" platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" spi: bitbang: Follow renaming of SPI "master" to "controller" spi: cadence-quadspi: Don't emit error message on allocation error spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" spi: cavium: Follow renaming of SPI "master" to "controller" spi: geni-qcom: Follow renaming of SPI "master" to "controller" spi: loopback-test: Follow renaming of SPI "master" to "controller" spi: slave-mt27xx: Follow renaming of SPI "master" to "controller" spi: spidev: Follow renaming of SPI "master" to "controller" staging: fbtft: Follow renaming of SPI "master" to "controller" staging: greybus: spi: Follow renaming of SPI "master" to "controller" tpm_tis_spi: Follow renaming of SPI "master" to "controller" usb: gadget: max3420_udc: Follow renaming of SPI "master" to "controller" video: fbdev: mmp: Follow renaming of SPI "master" to "controller" wifi: libertas: Follow renaming of SPI "master" to "controller" spi: fsl-lib: Follow renaming of SPI "master" to "controller" spi: Drop compat layer from renaming "master" to "controller" Documentation: spi: Update documentation for renaming "master" to "controller"
.../driver-api/driver-model/devres.rst | 2 +- Documentation/spi/spi-summary.rst | 74 +++++++++---------- drivers/char/tpm/tpm_tis_spi_main.c | 4 +- drivers/fpga/ice40-spi.c | 4 +- drivers/iio/adc/ad_sigma_delta.c | 14 ++-- drivers/input/joystick/psxpad-spi.c | 4 +- drivers/input/rmi4/rmi_spi.c | 2 +- drivers/media/pci/mgb4/mgb4_core.c | 14 ++-- .../media/pci/netup_unidvb/netup_unidvb_spi.c | 48 ++++++------ drivers/media/usb/msi2500/msi2500.c | 38 +++++----- drivers/media/v4l2-core/v4l2-spi.c | 4 +- drivers/misc/gehc-achc.c | 8 +- drivers/mmc/host/mmc_spi.c | 6 +- drivers/mtd/devices/mtd_dataflash.c | 2 +- drivers/net/ethernet/micrel/ks8851_spi.c | 4 +- drivers/net/ethernet/vertexcom/mse102x.c | 2 +- drivers/net/ieee802154/ca8210.c | 2 +- .../net/wireless/marvell/libertas/if_spi.c | 2 +- drivers/platform/chrome/cros_ec_spi.c | 8 +- drivers/spi/spi-ath79.c | 4 +- drivers/spi/spi-au1550.c | 2 +- drivers/spi/spi-bitbang.c | 64 ++++++++-------- drivers/spi/spi-butterfly.c | 6 +- drivers/spi/spi-cadence-quadspi.c | 7 +- drivers/spi/spi-cavium.c | 6 +- drivers/spi/spi-cavium.h | 2 +- drivers/spi/spi-davinci.c | 6 +- drivers/spi/spi-fsl-lib.c | 14 ++-- drivers/spi/spi-geni-qcom.c | 2 +- drivers/spi/spi-gpio.c | 2 +- drivers/spi/spi-lm70llp.c | 6 +- drivers/spi/spi-loopback-test.c | 4 +- drivers/spi/spi-oc-tiny.c | 6 +- drivers/spi/spi-omap-uwire.c | 4 +- drivers/spi/spi-sh-sci.c | 10 +-- drivers/spi/spi-slave-mt27xx.c | 2 +- drivers/spi/spi-xilinx.c | 4 +- drivers/spi/spi-xtensa-xtfpga.c | 2 +- drivers/spi/spi.c | 2 +- drivers/spi/spidev.c | 2 +- drivers/staging/fbtft/fbtft-core.c | 4 +- drivers/staging/greybus/spilib.c | 66 ++++++++--------- drivers/usb/gadget/udc/max3420_udc.c | 2 +- drivers/video/fbdev/mmp/hw/mmp_spi.c | 26 +++---- include/linux/spi/spi.h | 20 +---- include/linux/spi/spi_bitbang.h | 2 +- include/media/v4l2-common.h | 6 +- 47 files changed, 253 insertions(+), 272 deletions(-)
base-commit: b9b98f594b6f4c0b0fb2da4493453aef183bca4b
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: Miquel Raynal miquel.raynal@bootlin.com Acked-by: Jonathan Cameron Jonathan.Cameron@huawei.com Signed-off-by: Uwe Kleine-König u.kleine-koenig@pengutronix.de --- drivers/mtd/devices/mtd_dataflash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/mtd/devices/mtd_dataflash.c b/drivers/mtd/devices/mtd_dataflash.c index 0c1b93303618..ec52277e3dd5 100644 --- a/drivers/mtd/devices/mtd_dataflash.c +++ b/drivers/mtd/devices/mtd_dataflash.c @@ -638,7 +638,7 @@ static int add_dataflash_otp(struct spi_device *spi, char *name, int nr_pages,
/* name must be usable with cmdlinepart */ sprintf(priv->name, "spi%d.%d-%s", - spi->master->bus_num, spi_get_chipselect(spi, 0), + spi->controller->bus_num, spi_get_chipselect(spi, 0), name);
device = &priv->mtd;
On Wed, 07 Feb 2024 19:40:14 +0100, Uwe Kleine-König wrote:
Changes since v2 (https://lore.kernel.org/linux-spi/cover.1705944943.git.u.kleine-koenig@pengu...):
- Drop patch "mtd: rawnand: fsl_elbc: Let .probe retry if local bus is missing" which doesn't belong into this series.
- Fix a build failure noticed by the kernel build bot in drivers/spi/spi-au1550.c. (I failed to catch this because this driver is mips only, but not enabled in a mips allmodconfig. That's a bit unfortunate, but not easily fixable.)
- Add the Reviewed-by: and Acked-by: tags I received for v2.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[01/32] fpga: ice40-spi: Follow renaming of SPI "master" to "controller" commit: 227ab73b89d66e3064b3c2bcb5fe382b1815763d [02/32] ieee802154: ca8210: Follow renaming of SPI "master" to "controller" commit: 167b78446706bb4d19f7dd93ca320aed25ae1bbd [03/32] iio: adc: ad_sigma_delta: Follow renaming of SPI "master" to "controller" commit: 2780e7b716a605781dbee753ef4983d775a65427 [04/32] Input: pxspad - follow renaming of SPI "master" to "controller" commit: a78acec53b8524593afeed7258a442adc3450818 [05/32] Input: synaptics-rmi4 - follow renaming of SPI "master" to "controller" commit: 1245633c61baf159fcc1303d7f0855f49831b9c1 [06/32] media: mgb4: Follow renaming of SPI "master" to "controller" commit: 2c2f93fbfba7186cc081e23120f169eac3b5b62a [07/32] media: netup_unidvb: Follow renaming of SPI "master" to "controller" commit: cfa13a64bd631d8f04a1c385923706fcef9a63ed [08/32] media: usb/msi2500: Follow renaming of SPI "master" to "controller" commit: dd868ae646d5770f80f90dc056d06eb2e6d39c62 [09/32] media: v4l2-subdev: Follow renaming of SPI "master" to "controller" commit: d920b3a672b7f79cd13b341234aebd49233f836c [10/32] misc: gehc-achc: Follow renaming of SPI "master" to "controller" commit: 26dcf09ee5d9ceba2c627ae3ba174a229f25638f [11/32] mmc: mmc_spi: Follow renaming of SPI "master" to "controller" commit: b0a6776e53403aa380411f2a43cdefb9f00ff50a [12/32] mtd: dataflash: Follow renaming of SPI "master" to "controller" commit: 44ee998db9eef84bf005c39486566a67cb018354 [13/32] net: ks8851: Follow renaming of SPI "master" to "controller" commit: 1cc711a72ae7fd44e90839f0c8d3226664de55a2 [14/32] net: vertexcom: mse102x: Follow renaming of SPI "master" to "controller" commit: 7969b98b80c0332f940c547f84650a20aab33841 [15/32] platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" commit: 85ad0ec049a771c4910c8aebb2d0bd9ce9311fd9 [16/32] spi: bitbang: Follow renaming of SPI "master" to "controller" commit: 2259233110d90059187c5ba75537eb93eba8417b [17/32] spi: cadence-quadspi: Don't emit error message on allocation error commit: e71011dacc3413bed4118d2c42f10736ffcd762c [18/32] spi: cadence-quadspi: Follow renaming of SPI "master" to "controller" commit: 28e59d8bf1ace0ddf05f989a48d6824d75731267 [19/32] spi: cavium: Follow renaming of SPI "master" to "controller" commit: 1747fbdedba8b6b3fd459895ed5d57e534549884 [20/32] spi: geni-qcom: Follow renaming of SPI "master" to "controller" commit: 14cea92338a0776c1615994150e738ac0f5fbb2c [21/32] spi: loopback-test: Follow renaming of SPI "master" to "controller" commit: 2c2310c17fac13aa7e78756d7f3780c7891f9397 [22/32] spi: slave-mt27xx: Follow renaming of SPI "master" to "controller" commit: 8197b136bbbe64a7cab1020a4b067020e5977d98 [23/32] spi: spidev: Follow renaming of SPI "master" to "controller" commit: d934cd6f0e5d0052772612db4b07df60cb9da387 [24/32] staging: fbtft: Follow renaming of SPI "master" to "controller" commit: bbd25d7260eeeaef89f7371cbadcd33dd7f7bff9 [25/32] staging: greybus: spi: Follow renaming of SPI "master" to "controller" commit: ee3c668dda3d2783b0fff4091461356fe000e4d8 [26/32] tpm_tis_spi: Follow renaming of SPI "master" to "controller" commit: b6af14eacc8814b0986e20507df423cebe9fd859 [27/32] usb: gadget: max3420_udc: Follow renaming of SPI "master" to "controller" commit: 8c716f4a3d4fcbec976247e3443d36cbc24c0512 [28/32] video: fbdev: mmp: Follow renaming of SPI "master" to "controller" commit: b23031e730e72ec9067b7c38c25e776c5e27e116 [29/32] wifi: libertas: Follow renaming of SPI "master" to "controller" commit: 30060d57cee194d6b70283f2faf787e2fdc61b6e [30/32] spi: fsl-lib: Follow renaming of SPI "master" to "controller" commit: 801185efa2402dce57828930e9684884fc8d62da [31/32] spi: Drop compat layer from renaming "master" to "controller" commit: 620d269f29a569ba37419cc03cf1da2d55f6252a [32/32] Documentation: spi: Update documentation for renaming "master" to "controller" commit: 76b31eb4c2da3ddb3195cc14f6aad24908adf524
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
Hello:
This patch was applied to chrome-platform/linux.git (for-kernelci) by Mark Brown broonie@kernel.org:
On Wed, 7 Feb 2024 19:40:14 +0100 you wrote:
Changes since v2 (https://lore.kernel.org/linux-spi/cover.1705944943.git.u.kleine-koenig@pengu...):
- Drop patch "mtd: rawnand: fsl_elbc: Let .probe retry if local bus is missing" which doesn't belong into this series.
- Fix a build failure noticed by the kernel build bot in drivers/spi/spi-au1550.c. (I failed to catch this because this driver is mips only, but not enabled in a mips allmodconfig. That's a bit unfortunate, but not easily fixable.)
- Add the Reviewed-by: and Acked-by: tags I received for v2.
[...]
Here is the summary with links: - [v3,15/32] platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" https://git.kernel.org/chrome-platform/c/85ad0ec049a7
You are awesome, thank you!
Hello:
This patch was applied to chrome-platform/linux.git (for-next) by Mark Brown broonie@kernel.org:
On Wed, 7 Feb 2024 19:40:14 +0100 you wrote:
Changes since v2 (https://lore.kernel.org/linux-spi/cover.1705944943.git.u.kleine-koenig@pengu...):
- Drop patch "mtd: rawnand: fsl_elbc: Let .probe retry if local bus is missing" which doesn't belong into this series.
- Fix a build failure noticed by the kernel build bot in drivers/spi/spi-au1550.c. (I failed to catch this because this driver is mips only, but not enabled in a mips allmodconfig. That's a bit unfortunate, but not easily fixable.)
- Add the Reviewed-by: and Acked-by: tags I received for v2.
[...]
Here is the summary with links: - [v3,15/32] platform/chrome: cros_ec_spi: Follow renaming of SPI "master" to "controller" https://git.kernel.org/chrome-platform/c/85ad0ec049a7
You are awesome, thank you!
participants (3)
-
Mark Brown -
patchwork-bot+chrome-platform＠kernel.org -
Uwe Kleine-König