Unverified Commit 25fd0550 authored by Amit Kumar Mahapatra's avatar Amit Kumar Mahapatra Committed by Mark Brown
Browse files

net: Replace all spi->chip_select and spi->cs_gpiod references with function call 



Supporting multi-cs in spi drivers would require the chip_select & cs_gpiod
members of struct spi_device to be an array. But changing the type of these
members to array would break the spi driver functionality. To make the
transition smoother introduced four new APIs to get/set the
spi->chip_select & spi->cs_gpiod and replaced all spi->chip_select and
spi->cs_gpiod references with get or set API calls.
While adding multi-cs support in further patches the chip_select & cs_gpiod
members of the spi_device structure would be converted to arrays & the
"idx" parameter of the APIs would be used as array index i.e.,
spi->chip_select[idx] & spi->cs_gpiod[idx] respectively.

Signed-off-by: default avatarAmit Kumar Mahapatra <amit.kumar-mahapatra@amd.com>
Reviewed-by: default avatarMichal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20230310173217.3429788-3-amit.kumar-mahapatra@amd.com


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

drivers/net/ethernet/adi/adin1110.c

+1 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int adin1110_register_mdiobus(struct adin1110_priv *priv, 
		return -ENOMEM;



	snprintf(priv->mii_bus_name, MII_BUS_ID_SIZE, "%s-%u",

		 priv->cfg->name, priv->spidev->chip_select);

		 priv->cfg->name, spi_get_chipselect(priv->spidev, 0));



	mii_bus->name = priv->mii_bus_name;

	mii_bus->read = adin1110_mdio_read;

drivers/net/ethernet/asix/ax88796c_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,7 @@ static int ax88796c_probe(struct spi_device *spi) 
	ax_local->mdiobus->parent = &spi->dev;



	snprintf(ax_local->mdiobus->id, MII_BUS_ID_SIZE,

		 "ax88796c-%s.%u", dev_name(&spi->dev), spi->chip_select);

		 "ax88796c-%s.%u", dev_name(&spi->dev), spi_get_chipselect(spi, 0));



	ret = devm_mdiobus_register(&spi->dev, ax_local->mdiobus);

	if (ret < 0) {

drivers/net/ethernet/davicom/dm9051.c

+1 −1
Original line number Diff line number Diff line
@@ -1123,7 +1123,7 @@ static int dm9051_mdio_register(struct board_info *db) 
	db->mdiobus->phy_mask = (u32)~BIT(1);

	db->mdiobus->parent = &spi->dev;

	snprintf(db->mdiobus->id, MII_BUS_ID_SIZE,

		 "dm9051-%s.%u", dev_name(&spi->dev), spi->chip_select);

		 "dm9051-%s.%u", dev_name(&spi->dev), spi_get_chipselect(spi, 0));



	ret = devm_mdiobus_register(&spi->dev, db->mdiobus);

	if (ret)

drivers/net/ethernet/qualcomm/qca_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ qcaspi_info_show(struct seq_file *s, void *what) 
	seq_printf(s, "SPI mode         : %x\n",

		   qca->spi_dev->mode);

	seq_printf(s, "SPI chip select  : %u\n",

		   (unsigned int)qca->spi_dev->chip_select);

		   (unsigned int)spi_get_chipselect(qca->spi_dev, 0));

	seq_printf(s, "SPI legacy mode  : %u\n",

		   (unsigned int)qca->legacy_mode);

	seq_printf(s, "SPI burst length : %u\n",

drivers/net/ieee802154/ca8210.c

+1 −1
Original line number Diff line number Diff line
@@ -2967,7 +2967,7 @@ static int ca8210_test_interface_init(struct ca8210_priv *priv) 
		sizeof(node_name),

		"ca8210@%d_%d",

		priv->spi->master->bus_num,

		priv->spi->chip_select

		spi_get_chipselect(priv->spi, 0)

	);



	test->ca8210_dfs_spi_int = debugfs_create_file(