2022-03-07 07:12:00

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the amdgpu tree

Hi all,

After merging the amdgpu tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/tiny/panel-mipi-dbi.c:391:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
391 | .remove = panel_mipi_dbi_spi_remove,
| ^~~~~~~~~~~~~~~~~~~~~~~~~

Caused by commit

0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")

interacting with commit

a0386bba7093 ("spi: make remove callback a void function")

from the spi trees.

I have applied the following merge fix.

From: Stephen Rothwell <[email protected]>
Date: Mon, 7 Mar 2022 11:01:01 +1100
Subject: [PATCH] fix up for "spi: make remove callback a void function"

Signed-off-by: Stephen Rothwell <[email protected]>
---
drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/tiny/panel-mipi-dbi.c b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
index 7f8c6c51387f..c759ff9c2c87 100644
--- a/drivers/gpu/drm/tiny/panel-mipi-dbi.c
+++ b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
@@ -336,14 +336,12 @@ static int panel_mipi_dbi_spi_probe(struct spi_device *spi)
return 0;
}

-static int panel_mipi_dbi_spi_remove(struct spi_device *spi)
+static void panel_mipi_dbi_spi_remove(struct spi_device *spi)
{
struct drm_device *drm = spi_get_drvdata(spi);

drm_dev_unplug(drm);
drm_atomic_helper_shutdown(drm);
-
- return 0;
}

static void panel_mipi_dbi_spi_shutdown(struct spi_device *spi)
--
2.34.1

--
Cheers,
Stephen Rothwell


Attachments:
(No filename) (499.00 B)
OpenPGP digital signature

2022-03-07 09:20:51

by Uwe Kleine-König

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

Hello Stephen,

On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:
> After merging the amdgpu tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/gpu/drm/tiny/panel-mipi-dbi.c:391:19: error: initialization of 'void (*)(struct spi_device *)' from incompatible pointer type 'int (*)(struct spi_device *)' [-Werror=incompatible-pointer-types]
> 391 | .remove = panel_mipi_dbi_spi_remove,
> | ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
>
> interacting with commit
>
> a0386bba7093 ("spi: make remove callback a void function")
>
> from the spi trees.
>
> I have applied the following merge fix.
>
> From: Stephen Rothwell <[email protected]>
> Date: Mon, 7 Mar 2022 11:01:01 +1100
> Subject: [PATCH] fix up for "spi: make remove callback a void function"
>
> Signed-off-by: Stephen Rothwell <[email protected]>
> ---
> drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/tiny/panel-mipi-dbi.c b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
> index 7f8c6c51387f..c759ff9c2c87 100644
> --- a/drivers/gpu/drm/tiny/panel-mipi-dbi.c
> +++ b/drivers/gpu/drm/tiny/panel-mipi-dbi.c
> @@ -336,14 +336,12 @@ static int panel_mipi_dbi_spi_probe(struct spi_device *spi)
> return 0;
> }
>
> -static int panel_mipi_dbi_spi_remove(struct spi_device *spi)
> +static void panel_mipi_dbi_spi_remove(struct spi_device *spi)
> {
> struct drm_device *drm = spi_get_drvdata(spi);
>
> drm_dev_unplug(drm);
> drm_atomic_helper_shutdown(drm);
> -
> - return 0;
> }
>
> static void panel_mipi_dbi_spi_shutdown(struct spi_device *spi)

Looks right, thanks
Uwe

--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | https://www.pengutronix.de/ |


Attachments:
(No filename) (1.96 kB)
signature.asc (499.00 B)
Download all attachments

2022-03-08 08:55:42

by Mark Brown

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:

> Caused by commit
>
> 0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
>
> interacting with commit
>
> a0386bba7093 ("spi: make remove callback a void function")
>
> from the spi trees.

The amdgpu tree can pull this tag and apply Stephen's fix as part of
that:

The following changes since commit 26291c54e111ff6ba87a164d85d4a4e134b7315c:

Linux 5.17-rc2 (2022-01-30 15:37:07 +0200)

are available in the Git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-remove-void

for you to fetch changes up to a0386bba70934d42f586eaf68b21d5eeaffa7bd0:

spi: make remove callback a void function (2022-02-09 13:00:45 +0000)

----------------------------------------------------------------
spi: Make remove() return void

This series from Uwe Kleine-K?nig converts the spi remove function to
return void since there is nothing useful that we can do with a failure
and it as more buses are converted it'll enable further work on the
driver core.

----------------------------------------------------------------
Uwe Kleine-K?nig (5):
staging: fbtft: Fix error path in fbtft_driver_module_init()
staging: fbtft: Deduplicate driver registration macros
tpm: st33zp24: Make st33zp24_remove() a void function
platform/chrome: cros_ec: Make cros_ec_unregister() return void
spi: make remove callback a void function

drivers/bus/moxtet.c | 4 +-
drivers/char/tpm/st33zp24/i2c.c | 5 +-
drivers/char/tpm/st33zp24/spi.c | 9 +-
drivers/char/tpm/st33zp24/st33zp24.c | 3 +-
drivers/char/tpm/st33zp24/st33zp24.h | 2 +-
drivers/char/tpm/tpm_tis_spi_main.c | 3 +-
drivers/clk/clk-lmk04832.c | 4 +-
drivers/gpio/gpio-74x164.c | 4 +-
drivers/gpio/gpio-max3191x.c | 4 +-
drivers/gpio/gpio-max7301.c | 4 +-
drivers/gpio/gpio-mc33880.c | 4 +-
drivers/gpio/gpio-pisosr.c | 4 +-
drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +-
drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +-
drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +-
drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +-
drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +-
drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +-
drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +-
drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +-
drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +-
drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +-
drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +-
drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +-
drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +-
drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +-
drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +-
drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +-
drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +-
drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +-
drivers/gpu/drm/tiny/hx8357d.c | 4 +-
drivers/gpu/drm/tiny/ili9163.c | 4 +-
drivers/gpu/drm/tiny/ili9225.c | 4 +-
drivers/gpu/drm/tiny/ili9341.c | 4 +-
drivers/gpu/drm/tiny/ili9486.c | 4 +-
drivers/gpu/drm/tiny/mi0283qt.c | 4 +-
drivers/gpu/drm/tiny/repaper.c | 4 +-
drivers/gpu/drm/tiny/st7586.c | 4 +-
drivers/gpu/drm/tiny/st7735r.c | 4 +-
drivers/hwmon/adcxx.c | 4 +-
drivers/hwmon/adt7310.c | 3 +-
drivers/hwmon/max1111.c | 3 +-
drivers/hwmon/max31722.c | 4 +-
drivers/iio/accel/bma400_spi.c | 4 +-
drivers/iio/accel/bmc150-accel-spi.c | 4 +-
drivers/iio/accel/bmi088-accel-spi.c | 4 +-
drivers/iio/accel/kxsd9-spi.c | 4 +-
drivers/iio/accel/mma7455_spi.c | 4 +-
drivers/iio/accel/sca3000.c | 4 +-
drivers/iio/adc/ad7266.c | 4 +-
drivers/iio/adc/ltc2496.c | 4 +-
drivers/iio/adc/mcp320x.c | 4 +-
drivers/iio/adc/mcp3911.c | 4 +-
drivers/iio/adc/ti-adc12138.c | 4 +-
drivers/iio/adc/ti-ads7950.c | 4 +-
drivers/iio/adc/ti-ads8688.c | 4 +-
drivers/iio/adc/ti-tlc4541.c | 4 +-
drivers/iio/amplifiers/ad8366.c | 4 +-
drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +-
drivers/iio/dac/ad5360.c | 4 +-
drivers/iio/dac/ad5380.c | 4 +-
drivers/iio/dac/ad5446.c | 4 +-
drivers/iio/dac/ad5449.c | 4 +-
drivers/iio/dac/ad5504.c | 4 +-
drivers/iio/dac/ad5592r.c | 4 +-
drivers/iio/dac/ad5624r_spi.c | 4 +-
drivers/iio/dac/ad5686-spi.c | 4 +-
drivers/iio/dac/ad5761.c | 4 +-
drivers/iio/dac/ad5764.c | 4 +-
drivers/iio/dac/ad5791.c | 4 +-
drivers/iio/dac/ad8801.c | 4 +-
drivers/iio/dac/ltc1660.c | 4 +-
drivers/iio/dac/ltc2632.c | 4 +-
drivers/iio/dac/mcp4922.c | 4 +-
drivers/iio/dac/ti-dac082s085.c | 4 +-
drivers/iio/dac/ti-dac7311.c | 3 +-
drivers/iio/frequency/adf4350.c | 4 +-
drivers/iio/gyro/bmg160_spi.c | 4 +-
drivers/iio/gyro/fxas21002c_spi.c | 4 +-
drivers/iio/health/afe4403.c | 4 +-
drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +-
drivers/iio/magnetometer/hmc5843_spi.c | 4 +-
drivers/iio/potentiometer/max5487.c | 4 +-
drivers/iio/pressure/ms5611_spi.c | 4 +-
drivers/iio/pressure/zpa2326_spi.c | 4 +-
drivers/input/keyboard/applespi.c | 4 +-
drivers/input/misc/adxl34x-spi.c | 4 +-
drivers/input/touchscreen/ads7846.c | 4 +-
drivers/input/touchscreen/cyttsp4_spi.c | 4 +-
drivers/input/touchscreen/tsc2005.c | 4 +-
drivers/leds/leds-cr0014114.c | 4 +-
drivers/leds/leds-dac124s085.c | 4 +-
drivers/leds/leds-el15203000.c | 4 +-
drivers/leds/leds-spi-byte.c | 4 +-
drivers/media/spi/cxd2880-spi.c | 4 +-
drivers/media/spi/gs1662.c | 4 +-
drivers/media/tuners/msi001.c | 3 +-
drivers/mfd/arizona-spi.c | 4 +-
drivers/mfd/da9052-spi.c | 3 +-
drivers/mfd/ezx-pcap.c | 4 +-
drivers/mfd/madera-spi.c | 4 +-
drivers/mfd/mc13xxx-spi.c | 3 +-
drivers/mfd/rsmu_spi.c | 4 +-
drivers/mfd/stmpe-spi.c | 4 +-
drivers/mfd/tps65912-spi.c | 4 +-
drivers/misc/ad525x_dpot-spi.c | 3 +-
drivers/misc/eeprom/eeprom_93xx46.c | 4 +-
drivers/misc/lattice-ecp3-config.c | 4 +-
drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +-
drivers/mmc/host/mmc_spi.c | 3 +-
drivers/mtd/devices/mchp23k256.c | 4 +-
drivers/mtd/devices/mchp48l640.c | 4 +-
drivers/mtd/devices/mtd_dataflash.c | 4 +-
drivers/mtd/devices/sst25l.c | 4 +-
drivers/net/can/m_can/tcan4x5x-core.c | 4 +-
drivers/net/can/spi/hi311x.c | 4 +-
drivers/net/can/spi/mcp251x.c | 4 +-
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +-
drivers/net/dsa/b53/b53_spi.c | 4 +-
drivers/net/dsa/microchip/ksz8795_spi.c | 4 +-
drivers/net/dsa/microchip/ksz9477_spi.c | 4 +-
drivers/net/dsa/sja1105/sja1105_main.c | 6 +-
drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 +-
drivers/net/ethernet/asix/ax88796c_main.c | 4 +-
drivers/net/ethernet/micrel/ks8851_spi.c | 4 +-
drivers/net/ethernet/microchip/enc28j60.c | 4 +-
drivers/net/ethernet/microchip/encx24j600.c | 4 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 4 +-
drivers/net/ethernet/vertexcom/mse102x.c | 4 +-
drivers/net/ethernet/wiznet/w5100-spi.c | 4 +-
drivers/net/ieee802154/adf7242.c | 4 +-
drivers/net/ieee802154/at86rf230.c | 4 +-
drivers/net/ieee802154/ca8210.c | 6 +-
drivers/net/ieee802154/cc2520.c | 4 +-
drivers/net/ieee802154/mcr20a.c | 4 +-
drivers/net/ieee802154/mrf24j40.c | 4 +-
drivers/net/phy/spi_ks8995.c | 4 +-
drivers/net/wan/slic_ds26522.c | 3 +-
drivers/net/wireless/intersil/p54/p54spi.c | 4 +-
drivers/net/wireless/marvell/libertas/if_spi.c | 4 +-
drivers/net/wireless/microchip/wilc1000/spi.c | 4 +-
drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +-
drivers/net/wireless/ti/wl1251/spi.c | 4 +-
drivers/net/wireless/ti/wlcore/spi.c | 4 +-
drivers/nfc/nfcmrvl/spi.c | 3 +-
drivers/nfc/st-nci/spi.c | 4 +-
drivers/nfc/st95hf/core.c | 4 +-
drivers/nfc/trf7970a.c | 4 +-
drivers/platform/chrome/cros_ec.c | 4 +-
drivers/platform/chrome/cros_ec.h | 2 +-
drivers/platform/chrome/cros_ec_i2c.c | 4 +-
drivers/platform/chrome/cros_ec_lpc.c | 4 +-
drivers/platform/chrome/cros_ec_spi.c | 4 +-
drivers/platform/olpc/olpc-xo175-ec.c | 4 +-
drivers/rtc/rtc-ds1302.c | 3 +-
drivers/rtc/rtc-ds1305.c | 4 +-
drivers/rtc/rtc-ds1343.c | 4 +-
drivers/spi/spi-mem.c | 6 +-
drivers/spi/spi-slave-system-control.c | 3 +-
drivers/spi/spi-slave-time.c | 3 +-
drivers/spi/spi-tle62x0.c | 3 +-
drivers/spi/spi.c | 11 +--
drivers/spi/spidev.c | 4 +-
drivers/staging/fbtft/fbtft.h | 97 +++++++++-------------
drivers/staging/pi433/pi433_if.c | 4 +-
drivers/staging/wfx/bus_spi.c | 3 +-
drivers/tty/serial/max3100.c | 5 +-
drivers/tty/serial/max310x.c | 3 +-
drivers/tty/serial/sc16is7xx.c | 4 +-
drivers/usb/gadget/udc/max3420_udc.c | 4 +-
drivers/usb/host/max3421-hcd.c | 3 +-
drivers/video/backlight/ams369fg06.c | 3 +-
drivers/video/backlight/corgi_lcd.c | 3 +-
drivers/video/backlight/ili922x.c | 3 +-
drivers/video/backlight/l4f00242t03.c | 3 +-
drivers/video/backlight/lms501kf03.c | 3 +-
drivers/video/backlight/ltv350qv.c | 3 +-
drivers/video/backlight/tdo24m.c | 3 +-
drivers/video/backlight/tosa_lcd.c | 4 +-
drivers/video/backlight/vgg2432a4.c | 4 +-
drivers/video/fbdev/omap/lcd_mipid.c | 4 +-
.../omapfb/displays/panel-lgphilips-lb035q02.c | 4 +-
.../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +-
.../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +-
.../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +-
.../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +-
include/linux/spi/spi.h | 2 +-
sound/pci/hda/cs35l41_hda_spi.c | 4 +-
sound/soc/codecs/adau1761-spi.c | 3 +-
sound/soc/codecs/adau1781-spi.c | 3 +-
sound/soc/codecs/cs35l41-spi.c | 4 +-
sound/soc/codecs/pcm3168a-spi.c | 4 +-
sound/soc/codecs/pcm512x-spi.c | 3 +-
sound/soc/codecs/tlv320aic32x4-spi.c | 4 +-
sound/soc/codecs/tlv320aic3x-spi.c | 4 +-
sound/soc/codecs/wm0010.c | 4 +-
sound/soc/codecs/wm8804-spi.c | 3 +-
sound/spi/at73c213.c | 4 +-
198 files changed, 248 insertions(+), 617 deletions(-)


Attachments:
(No filename) (13.35 kB)
signature.asc (499.00 B)
Download all attachments

2022-03-09 02:02:37

by Noralf Trønnes

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the amdgpu tree

Hi drm-misc maintainers,

I don't know who has act on this but the driver came through
drm-misc-next so it's most likely not amd.

The initial post can be found here:
https://lore.kernel.org/linux-next/YiYC2fQgf7d%[email protected]/T/

Noralf.

Den 07.03.2022 14.04, skrev Mark Brown:
> On Mon, Mar 07, 2022 at 11:13:42AM +1100, Stephen Rothwell wrote:
>
>> Caused by commit
>>
>> 0e65e2e6abb0 ("drm/tiny: Add MIPI DBI compatible SPI driver")
>>
>> interacting with commit
>>
>> a0386bba7093 ("spi: make remove callback a void function")
>>
>> from the spi trees.
>
> The amdgpu tree can pull this tag and apply Stephen's fix as part of
> that:
>
> The following changes since commit 26291c54e111ff6ba87a164d85d4a4e134b7315c:
>
> Linux 5.17-rc2 (2022-01-30 15:37:07 +0200)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git tags/spi-remove-void
>
> for you to fetch changes up to a0386bba70934d42f586eaf68b21d5eeaffa7bd0:
>
> spi: make remove callback a void function (2022-02-09 13:00:45 +0000)
>
> ----------------------------------------------------------------
> spi: Make remove() return void
>
> This series from Uwe Kleine-König converts the spi remove function to
> return void since there is nothing useful that we can do with a failure
> and it as more buses are converted it'll enable further work on the
> driver core.
>
> ----------------------------------------------------------------
> Uwe Kleine-König (5):
> staging: fbtft: Fix error path in fbtft_driver_module_init()
> staging: fbtft: Deduplicate driver registration macros
> tpm: st33zp24: Make st33zp24_remove() a void function
> platform/chrome: cros_ec: Make cros_ec_unregister() return void
> spi: make remove callback a void function
>
> drivers/bus/moxtet.c | 4 +-
> drivers/char/tpm/st33zp24/i2c.c | 5 +-
> drivers/char/tpm/st33zp24/spi.c | 9 +-
> drivers/char/tpm/st33zp24/st33zp24.c | 3 +-
> drivers/char/tpm/st33zp24/st33zp24.h | 2 +-
> drivers/char/tpm/tpm_tis_spi_main.c | 3 +-
> drivers/clk/clk-lmk04832.c | 4 +-
> drivers/gpio/gpio-74x164.c | 4 +-
> drivers/gpio/gpio-max3191x.c | 4 +-
> drivers/gpio/gpio-max7301.c | 4 +-
> drivers/gpio/gpio-mc33880.c | 4 +-
> drivers/gpio/gpio-pisosr.c | 4 +-
> drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 4 +-
> drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 4 +-
> drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +-
> drivers/gpu/drm/panel/panel-innolux-ej030na.c | 4 +-
> drivers/gpu/drm/panel/panel-lg-lb035q02.c | 4 +-
> drivers/gpu/drm/panel/panel-lg-lg4573.c | 4 +-
> drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 4 +-
> drivers/gpu/drm/panel/panel-novatek-nt39016.c | 4 +-
> drivers/gpu/drm/panel/panel-samsung-db7430.c | 3 +-
> drivers/gpu/drm/panel/panel-samsung-ld9040.c | 4 +-
> drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 3 +-
> drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 3 +-
> drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 4 +-
> drivers/gpu/drm/panel/panel-sony-acx565akm.c | 4 +-
> drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 4 +-
> drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 4 +-
> drivers/gpu/drm/panel/panel-tpo-tpg110.c | 3 +-
> drivers/gpu/drm/panel/panel-widechips-ws2401.c | 3 +-
> drivers/gpu/drm/tiny/hx8357d.c | 4 +-
> drivers/gpu/drm/tiny/ili9163.c | 4 +-
> drivers/gpu/drm/tiny/ili9225.c | 4 +-
> drivers/gpu/drm/tiny/ili9341.c | 4 +-
> drivers/gpu/drm/tiny/ili9486.c | 4 +-
> drivers/gpu/drm/tiny/mi0283qt.c | 4 +-
> drivers/gpu/drm/tiny/repaper.c | 4 +-
> drivers/gpu/drm/tiny/st7586.c | 4 +-
> drivers/gpu/drm/tiny/st7735r.c | 4 +-
> drivers/hwmon/adcxx.c | 4 +-
> drivers/hwmon/adt7310.c | 3 +-
> drivers/hwmon/max1111.c | 3 +-
> drivers/hwmon/max31722.c | 4 +-
> drivers/iio/accel/bma400_spi.c | 4 +-
> drivers/iio/accel/bmc150-accel-spi.c | 4 +-
> drivers/iio/accel/bmi088-accel-spi.c | 4 +-
> drivers/iio/accel/kxsd9-spi.c | 4 +-
> drivers/iio/accel/mma7455_spi.c | 4 +-
> drivers/iio/accel/sca3000.c | 4 +-
> drivers/iio/adc/ad7266.c | 4 +-
> drivers/iio/adc/ltc2496.c | 4 +-
> drivers/iio/adc/mcp320x.c | 4 +-
> drivers/iio/adc/mcp3911.c | 4 +-
> drivers/iio/adc/ti-adc12138.c | 4 +-
> drivers/iio/adc/ti-ads7950.c | 4 +-
> drivers/iio/adc/ti-ads8688.c | 4 +-
> drivers/iio/adc/ti-tlc4541.c | 4 +-
> drivers/iio/amplifiers/ad8366.c | 4 +-
> drivers/iio/common/ssp_sensors/ssp_dev.c | 4 +-
> drivers/iio/dac/ad5360.c | 4 +-
> drivers/iio/dac/ad5380.c | 4 +-
> drivers/iio/dac/ad5446.c | 4 +-
> drivers/iio/dac/ad5449.c | 4 +-
> drivers/iio/dac/ad5504.c | 4 +-
> drivers/iio/dac/ad5592r.c | 4 +-
> drivers/iio/dac/ad5624r_spi.c | 4 +-
> drivers/iio/dac/ad5686-spi.c | 4 +-
> drivers/iio/dac/ad5761.c | 4 +-
> drivers/iio/dac/ad5764.c | 4 +-
> drivers/iio/dac/ad5791.c | 4 +-
> drivers/iio/dac/ad8801.c | 4 +-
> drivers/iio/dac/ltc1660.c | 4 +-
> drivers/iio/dac/ltc2632.c | 4 +-
> drivers/iio/dac/mcp4922.c | 4 +-
> drivers/iio/dac/ti-dac082s085.c | 4 +-
> drivers/iio/dac/ti-dac7311.c | 3 +-
> drivers/iio/frequency/adf4350.c | 4 +-
> drivers/iio/gyro/bmg160_spi.c | 4 +-
> drivers/iio/gyro/fxas21002c_spi.c | 4 +-
> drivers/iio/health/afe4403.c | 4 +-
> drivers/iio/magnetometer/bmc150_magn_spi.c | 4 +-
> drivers/iio/magnetometer/hmc5843_spi.c | 4 +-
> drivers/iio/potentiometer/max5487.c | 4 +-
> drivers/iio/pressure/ms5611_spi.c | 4 +-
> drivers/iio/pressure/zpa2326_spi.c | 4 +-
> drivers/input/keyboard/applespi.c | 4 +-
> drivers/input/misc/adxl34x-spi.c | 4 +-
> drivers/input/touchscreen/ads7846.c | 4 +-
> drivers/input/touchscreen/cyttsp4_spi.c | 4 +-
> drivers/input/touchscreen/tsc2005.c | 4 +-
> drivers/leds/leds-cr0014114.c | 4 +-
> drivers/leds/leds-dac124s085.c | 4 +-
> drivers/leds/leds-el15203000.c | 4 +-
> drivers/leds/leds-spi-byte.c | 4 +-
> drivers/media/spi/cxd2880-spi.c | 4 +-
> drivers/media/spi/gs1662.c | 4 +-
> drivers/media/tuners/msi001.c | 3 +-
> drivers/mfd/arizona-spi.c | 4 +-
> drivers/mfd/da9052-spi.c | 3 +-
> drivers/mfd/ezx-pcap.c | 4 +-
> drivers/mfd/madera-spi.c | 4 +-
> drivers/mfd/mc13xxx-spi.c | 3 +-
> drivers/mfd/rsmu_spi.c | 4 +-
> drivers/mfd/stmpe-spi.c | 4 +-
> drivers/mfd/tps65912-spi.c | 4 +-
> drivers/misc/ad525x_dpot-spi.c | 3 +-
> drivers/misc/eeprom/eeprom_93xx46.c | 4 +-
> drivers/misc/lattice-ecp3-config.c | 4 +-
> drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +-
> drivers/mmc/host/mmc_spi.c | 3 +-
> drivers/mtd/devices/mchp23k256.c | 4 +-
> drivers/mtd/devices/mchp48l640.c | 4 +-
> drivers/mtd/devices/mtd_dataflash.c | 4 +-
> drivers/mtd/devices/sst25l.c | 4 +-
> drivers/net/can/m_can/tcan4x5x-core.c | 4 +-
> drivers/net/can/spi/hi311x.c | 4 +-
> drivers/net/can/spi/mcp251x.c | 4 +-
> drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 +-
> drivers/net/dsa/b53/b53_spi.c | 4 +-
> drivers/net/dsa/microchip/ksz8795_spi.c | 4 +-
> drivers/net/dsa/microchip/ksz9477_spi.c | 4 +-
> drivers/net/dsa/sja1105/sja1105_main.c | 6 +-
> drivers/net/dsa/vitesse-vsc73xx-spi.c | 6 +-
> drivers/net/ethernet/asix/ax88796c_main.c | 4 +-
> drivers/net/ethernet/micrel/ks8851_spi.c | 4 +-
> drivers/net/ethernet/microchip/enc28j60.c | 4 +-
> drivers/net/ethernet/microchip/encx24j600.c | 4 +-
> drivers/net/ethernet/qualcomm/qca_spi.c | 4 +-
> drivers/net/ethernet/vertexcom/mse102x.c | 4 +-
> drivers/net/ethernet/wiznet/w5100-spi.c | 4 +-
> drivers/net/ieee802154/adf7242.c | 4 +-
> drivers/net/ieee802154/at86rf230.c | 4 +-
> drivers/net/ieee802154/ca8210.c | 6 +-
> drivers/net/ieee802154/cc2520.c | 4 +-
> drivers/net/ieee802154/mcr20a.c | 4 +-
> drivers/net/ieee802154/mrf24j40.c | 4 +-
> drivers/net/phy/spi_ks8995.c | 4 +-
> drivers/net/wan/slic_ds26522.c | 3 +-
> drivers/net/wireless/intersil/p54/p54spi.c | 4 +-
> drivers/net/wireless/marvell/libertas/if_spi.c | 4 +-
> drivers/net/wireless/microchip/wilc1000/spi.c | 4 +-
> drivers/net/wireless/st/cw1200/cw1200_spi.c | 4 +-
> drivers/net/wireless/ti/wl1251/spi.c | 4 +-
> drivers/net/wireless/ti/wlcore/spi.c | 4 +-
> drivers/nfc/nfcmrvl/spi.c | 3 +-
> drivers/nfc/st-nci/spi.c | 4 +-
> drivers/nfc/st95hf/core.c | 4 +-
> drivers/nfc/trf7970a.c | 4 +-
> drivers/platform/chrome/cros_ec.c | 4 +-
> drivers/platform/chrome/cros_ec.h | 2 +-
> drivers/platform/chrome/cros_ec_i2c.c | 4 +-
> drivers/platform/chrome/cros_ec_lpc.c | 4 +-
> drivers/platform/chrome/cros_ec_spi.c | 4 +-
> drivers/platform/olpc/olpc-xo175-ec.c | 4 +-
> drivers/rtc/rtc-ds1302.c | 3 +-
> drivers/rtc/rtc-ds1305.c | 4 +-
> drivers/rtc/rtc-ds1343.c | 4 +-
> drivers/spi/spi-mem.c | 6 +-
> drivers/spi/spi-slave-system-control.c | 3 +-
> drivers/spi/spi-slave-time.c | 3 +-
> drivers/spi/spi-tle62x0.c | 3 +-
> drivers/spi/spi.c | 11 +--
> drivers/spi/spidev.c | 4 +-
> drivers/staging/fbtft/fbtft.h | 97 +++++++++-------------
> drivers/staging/pi433/pi433_if.c | 4 +-
> drivers/staging/wfx/bus_spi.c | 3 +-
> drivers/tty/serial/max3100.c | 5 +-
> drivers/tty/serial/max310x.c | 3 +-
> drivers/tty/serial/sc16is7xx.c | 4 +-
> drivers/usb/gadget/udc/max3420_udc.c | 4 +-
> drivers/usb/host/max3421-hcd.c | 3 +-
> drivers/video/backlight/ams369fg06.c | 3 +-
> drivers/video/backlight/corgi_lcd.c | 3 +-
> drivers/video/backlight/ili922x.c | 3 +-
> drivers/video/backlight/l4f00242t03.c | 3 +-
> drivers/video/backlight/lms501kf03.c | 3 +-
> drivers/video/backlight/ltv350qv.c | 3 +-
> drivers/video/backlight/tdo24m.c | 3 +-
> drivers/video/backlight/tosa_lcd.c | 4 +-
> drivers/video/backlight/vgg2432a4.c | 4 +-
> drivers/video/fbdev/omap/lcd_mipid.c | 4 +-
> .../omapfb/displays/panel-lgphilips-lb035q02.c | 4 +-
> .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 4 +-
> .../omap2/omapfb/displays/panel-sony-acx565akm.c | 4 +-
> .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 4 +-
> .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 4 +-
> include/linux/spi/spi.h | 2 +-
> sound/pci/hda/cs35l41_hda_spi.c | 4 +-
> sound/soc/codecs/adau1761-spi.c | 3 +-
> sound/soc/codecs/adau1781-spi.c | 3 +-
> sound/soc/codecs/cs35l41-spi.c | 4 +-
> sound/soc/codecs/pcm3168a-spi.c | 4 +-
> sound/soc/codecs/pcm512x-spi.c | 3 +-
> sound/soc/codecs/tlv320aic32x4-spi.c | 4 +-
> sound/soc/codecs/tlv320aic3x-spi.c | 4 +-
> sound/soc/codecs/wm0010.c | 4 +-
> sound/soc/codecs/wm8804-spi.c | 3 +-
> sound/spi/at73c213.c | 4 +-
> 198 files changed, 248 insertions(+), 617 deletions(-)