Unverified Commit 620d269f authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mark Brown
Browse files

spi: Drop compat layer from renaming "master" to "controller" 



Now that all in-tree users followed the rename, the compat stuff can go
away.  This completes the renaming started with commit 8caab75f
("spi: Generalize SPI "master" to "controller"")

Acked-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/ad1d949325b61a4682e8d6ecf9d05da751e6a99f.1707324794.git.u.kleine-koenig@pengutronix.de


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 801185ef

Documentation/driver-api/driver-model/devres.rst

+1 −1
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ SLAVE DMA ENGINE 
SPI

  devm_spi_alloc_master()

  devm_spi_alloc_slave()

  devm_spi_register_master()

  devm_spi_register_controller()



WATCHDOG

  devm_watchdog_register_device()

drivers/spi/spi.c

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ struct spi_device *spi_alloc_device(struct spi_controller *ctlr) 
		return NULL;

	}



	spi->master = spi->controller = ctlr;

	spi->controller = ctlr;

	spi->dev.parent = &ctlr->dev;

	spi->dev.bus = &spi_bus_type;

	spi->dev.release = spidev_release;

include/linux/spi/spi.h

+1 −19
Original line number Diff line number Diff line
@@ -131,7 +131,6 @@ extern void spi_transfer_cs_change_delay_exec(struct spi_message *msg, 
 * struct spi_device - Controller side proxy for an SPI slave device

 * @dev: Driver model representation of the device.

 * @controller: SPI controller used with the device.

 * @master: Copy of controller, for backwards compatibility.

 * @max_speed_hz: Maximum clock rate to be used with this chip

 *	(on this board); may be changed by the device's driver.

 *	The spi_transfer.speed_hz can override this for each transfer.
@@ -185,7 +184,6 @@ extern void spi_transfer_cs_change_delay_exec(struct spi_message *msg, 
struct spi_device {

	struct device		dev;

	struct spi_controller	*controller;

	struct spi_controller	*master;	/* Compatibility layer */

	u32			max_speed_hz;

	u8			chip_select[SPI_CS_CNT_MAX];

	u8			bits_per_word;
@@ -1298,7 +1296,7 @@ spi_max_transfer_size(struct spi_device *spi) 
 */

static inline bool spi_is_bpw_supported(struct spi_device *spi, u32 bpw)

{

	u32 bpw_mask = spi->master->bits_per_word_mask;

	u32 bpw_mask = spi->controller->bits_per_word_mask;



	if (bpw == 8 || (bpw <= 32 && bpw_mask & SPI_BPW_MASK(bpw)))

		return true;
@@ -1670,20 +1668,4 @@ spi_transfer_is_last(struct spi_controller *ctlr, struct spi_transfer *xfer) 
	return list_is_last(&xfer->transfer_list, &ctlr->cur_msg->transfers);

}



/* Compatibility layer */

#define spi_master			spi_controller



#define spi_master_get_devdata(_ctlr)	spi_controller_get_devdata(_ctlr)

#define spi_master_set_devdata(_ctlr, _data)	\

	spi_controller_set_devdata(_ctlr, _data)

#define spi_master_get(_ctlr)		spi_controller_get(_ctlr)

#define spi_master_put(_ctlr)		spi_controller_put(_ctlr)

#define spi_master_suspend(_ctlr)	spi_controller_suspend(_ctlr)

#define spi_master_resume(_ctlr)	spi_controller_resume(_ctlr)



#define spi_register_master(_ctlr)	spi_register_controller(_ctlr)

#define devm_spi_register_master(_dev, _ctlr) \

	devm_spi_register_controller(_dev, _ctlr)

#define spi_unregister_master(_ctlr)	spi_unregister_controller(_ctlr)



#endif /* __LINUX_SPI_H */