Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf9d0dcc authored by Varka Bhadram's avatar Varka Bhadram Committed by David S. Miller
Browse files

ethernet: qualcomm: use spi instead of spi_device 



All spi based drivers have an instance of struct spi_device
as spi. This patch renames spi_device to spi to synchronize
with all the drivers.

Signed-off-by: default avatarVarka Bhadram <varkab@cdac.in>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3e3b3468

drivers/net/ethernet/qualcomm/qca_spi.c

+23 −23
Original line number Diff line number Diff line
@@ -839,7 +839,7 @@ static const struct of_device_id qca_spi_of_match[] = { 
MODULE_DEVICE_TABLE(of, qca_spi_of_match);



static int

qca_spi_probe(struct spi_device *spi_device)

qca_spi_probe(struct spi_device *spi)

{

	struct qcaspi *qca = NULL;

	struct net_device *qcaspi_devs = NULL;
@@ -847,52 +847,52 @@ qca_spi_probe(struct spi_device *spi_device) 
	u16 signature;

	const char *mac;



	if (!spi_device->dev.of_node) {

		dev_err(&spi_device->dev, "Missing device tree\n");

	if (!spi->dev.of_node) {

		dev_err(&spi->dev, "Missing device tree\n");

		return -EINVAL;

	}



	legacy_mode = of_property_read_bool(spi_device->dev.of_node,

	legacy_mode = of_property_read_bool(spi->dev.of_node,

					    "qca,legacy-mode");



	if (qcaspi_clkspeed == 0) {

		if (spi_device->max_speed_hz)

			qcaspi_clkspeed = spi_device->max_speed_hz;

		if (spi->max_speed_hz)

			qcaspi_clkspeed = spi->max_speed_hz;

		else

			qcaspi_clkspeed = QCASPI_CLK_SPEED;

	}



	if ((qcaspi_clkspeed < QCASPI_CLK_SPEED_MIN) ||

	    (qcaspi_clkspeed > QCASPI_CLK_SPEED_MAX)) {

		dev_info(&spi_device->dev, "Invalid clkspeed: %d\n",

		dev_info(&spi->dev, "Invalid clkspeed: %d\n",

			 qcaspi_clkspeed);

		return -EINVAL;

	}



	if ((qcaspi_burst_len < QCASPI_BURST_LEN_MIN) ||

	    (qcaspi_burst_len > QCASPI_BURST_LEN_MAX)) {

		dev_info(&spi_device->dev, "Invalid burst len: %d\n",

		dev_info(&spi->dev, "Invalid burst len: %d\n",

			 qcaspi_burst_len);

		return -EINVAL;

	}



	if ((qcaspi_pluggable < QCASPI_PLUGGABLE_MIN) ||

	    (qcaspi_pluggable > QCASPI_PLUGGABLE_MAX)) {

		dev_info(&spi_device->dev, "Invalid pluggable: %d\n",

		dev_info(&spi->dev, "Invalid pluggable: %d\n",

			 qcaspi_pluggable);

		return -EINVAL;

	}



	dev_info(&spi_device->dev, "ver=%s, clkspeed=%d, burst_len=%d, pluggable=%d\n",

	dev_info(&spi->dev, "ver=%s, clkspeed=%d, burst_len=%d, pluggable=%d\n",

		 QCASPI_DRV_VERSION,

		 qcaspi_clkspeed,

		 qcaspi_burst_len,

		 qcaspi_pluggable);



	spi_device->mode = SPI_MODE_3;

	spi_device->max_speed_hz = qcaspi_clkspeed;

	if (spi_setup(spi_device) < 0) {

		dev_err(&spi_device->dev, "Unable to setup SPI device\n");

	spi->mode = SPI_MODE_3;

	spi->max_speed_hz = qcaspi_clkspeed;

	if (spi_setup(spi) < 0) {

		dev_err(&spi->dev, "Unable to setup SPI device\n");

		return -EFAULT;

	}
@@ -905,21 +905,21 @@ qca_spi_probe(struct spi_device *spi_device) 
	qca = netdev_priv(qcaspi_devs);

	if (!qca) {

		free_netdev(qcaspi_devs);

		dev_err(&spi_device->dev, "Fail to retrieve private structure\n");

		dev_err(&spi->dev, "Fail to retrieve private structure\n");

		return -ENOMEM;

	}

	qca->net_dev = qcaspi_devs;

	qca->spi_dev = spi_device;

	qca->spi_dev = spi;

	qca->legacy_mode = legacy_mode;



	mac = of_get_mac_address(spi_device->dev.of_node);

	mac = of_get_mac_address(spi->dev.of_node);



	if (mac)

		ether_addr_copy(qca->net_dev->dev_addr, mac);



	if (!is_valid_ether_addr(qca->net_dev->dev_addr)) {

		eth_hw_addr_random(qca->net_dev);

		dev_info(&spi_device->dev, "Using random MAC address: %pM\n",

		dev_info(&spi->dev, "Using random MAC address: %pM\n",

			 qca->net_dev->dev_addr);

	}
@@ -930,7 +930,7 @@ qca_spi_probe(struct spi_device *spi_device) 
		qcaspi_read_register(qca, SPI_REG_SIGNATURE, &signature);



		if (signature != QCASPI_GOOD_SIGNATURE) {

			dev_err(&spi_device->dev, "Invalid signature (0x%04X)\n",

			dev_err(&spi->dev, "Invalid signature (0x%04X)\n",

				signature);

			free_netdev(qcaspi_devs);

			return -EFAULT;
@@ -938,13 +938,13 @@ qca_spi_probe(struct spi_device *spi_device) 
	}



	if (register_netdev(qcaspi_devs)) {

		dev_info(&spi_device->dev, "Unable to register net device %s\n",

		dev_info(&spi->dev, "Unable to register net device %s\n",

			 qcaspi_devs->name);

		free_netdev(qcaspi_devs);

		return -EFAULT;

	}



	spi_set_drvdata(spi_device, qcaspi_devs);

	spi_set_drvdata(spi, qcaspi_devs);



	qcaspi_init_device_debugfs(qca);
@@ -952,9 +952,9 @@ qca_spi_probe(struct spi_device *spi_device) 
}



static int

qca_spi_remove(struct spi_device *spi_device)

qca_spi_remove(struct spi_device *spi)

{

	struct net_device *qcaspi_devs = spi_get_drvdata(spi_device);

	struct net_device *qcaspi_devs = spi_get_drvdata(spi);

	struct qcaspi *qca = netdev_priv(qcaspi_devs);



	qcaspi_remove_device_debugfs(qca);