spi: sifive: Tidy up dm_spi_slave_platdata variable
Subsystems (2)
PATCH 1/1 spi: sifive: Tidy up dm_spi_slave_platdata variable
Usually variable name slave is used for spi_slave structure and plat_slave for the dm_spi_slave_platdata.
Let's follow this meaningful notation by replacing slave with plat_slave for dm_spi_slave_platdata structure.
--- drivers/spi/spi-sifive.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)
drivers/spi/spi-sifive.c +15 -15
@@ -95,25 +95,25 @@ struct sifive_spi { };static void sifive_spi_prep_device (struct sifive_spi *spi, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat) {/* Update the chip select polarity */ -if (slave->mode &SPI_CS_HIGH ) - spi->cs_inactive &= ~BIT (slave->cs); +if (slave_plat->mode &SPI_CS_HIGH ) + spi->cs_inactive &= ~BIT (slave_plat->cs);else - spi->cs_inactive |=BIT (slave->cs); + spi->cs_inactive |=BIT (slave_plat->cs);writel (spi->cs_inactive, spi->regs +SIFIVE_SPI_REG_CSDEF );/* Select the correct device */ -writel (slave->cs, spi->regs +SIFIVE_SPI_REG_CSID ); +writel (slave_plat->cs, spi->regs +SIFIVE_SPI_REG_CSID ); }static int sifive_spi_set_cs (struct sifive_spi *spi, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat) {u32 cs_mode =SIFIVE_SPI_CSMODE_MODE_HOLD ; -if (slave->mode &SPI_CS_HIGH ) +if (slave_plat->mode &SPI_CS_HIGH ) cs_mode =SIFIVE_SPI_CSMODE_MODE_AUTO ;writel (cs_mode, spi->regs +SIFIVE_SPI_REG_CSMODE );
@@ -128,7 +128,7 @@ static void sifive_spi_clear_cs(struct sifive_spi *spi)static void sifive_spi_prep_transfer (struct sifive_spi *spi,bool is_rx_xfer, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat) {u32 cr;
@@ -141,14 +141,14 @@ static void sifive_spi_prep_transfer(struct sifive_spi *spi,/* LSB first? */ cr &= ~SIFIVE_SPI_FMT_ENDIAN ; -if (slave->mode &SPI_LSB_FIRST ) +if (slave_plat->mode &SPI_LSB_FIRST ) cr |=SIFIVE_SPI_FMT_ENDIAN ;/* Number of wires ? */ cr &= ~SIFIVE_SPI_FMT_PROTO_MASK ; -if ((slave->mode &SPI_TX_QUAD ) || (slave->mode &SPI_RX_QUAD )) +if ((slave_plat->mode &SPI_TX_QUAD ) || (slave_plat->mode &SPI_RX_QUAD )) cr |=SIFIVE_SPI_FMT_PROTO_QUAD ; -else if ((slave->mode &SPI_TX_DUAL ) || (slave->mode &SPI_RX_DUAL )) +else if ((slave_plat->mode &SPI_TX_DUAL ) || (slave_plat->mode &SPI_RX_DUAL )) cr |=SIFIVE_SPI_FMT_PROTO_DUAL ;else cr |=SIFIVE_SPI_FMT_PROTO_SINGLE ;
@@ -191,21 +191,21 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, {struct udevice *bus = dev->parent;struct sifive_spi *spi =dev_get_priv (bus); -struct dm_spi_slave_platdata *slave =dev_get_parent_platdata (dev); +struct dm_spi_slave_platdata *slave_plat =dev_get_parent_platdata (dev);const unsigned char *tx_ptr = dout;u8 *rx_ptr = din;u32 remaining_len;int ret;if (flags &SPI_XFER_BEGIN ) { -sifive_spi_prep_device (spi, slave); +sifive_spi_prep_device (spi, slave_plat); - ret =sifive_spi_set_cs (spi, slave); + ret =sifive_spi_set_cs (spi, slave_plat);if (ret)return ret; } -sifive_spi_prep_transfer (spi, true, slave); +sifive_spi_prep_transfer (spi, true, slave_plat); remaining_len = bitlen /8 ;
Signature · 1 line
2.17.1
PATCH 1/1 spi: sifive: Tidy up dm_spi_slave_platdata variable
Hi Jagan,
Quoted 17 lines · Jagan Teki
Usually variable name slave is used for
spi_slavestructure andplat_slavefor thedm_spi_slave_platdata.Let's follow this meaningful notation by replacing slave with
plat_slavefordm_spi_slave_platdatastructure.Signed-off-by Jagan Teki <[email protected]>--- drivers/spi/spi-sifive.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)drivers/spi/spi-sifive.c +0
-0
drivers/spi/spi-sifive.c struct sifive_spi { · line 98
Quoted 5 lines
drivers/spi/spi-sifive.c +1
-1@@ -95,25 +95,25 @@ struct sifive_spi { };static void sifive_spi_prep_device (struct sifive_spi *spi, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat)
Commit message says: plat_slave for the dm_spi_slave_platdata
plat_slave or slave_plat ?
Quoted 70 lines
drivers/spi/spi-sifive.c +12
-13{/* Update the chip select polarity */ -if (slave->mode &SPI_CS_HIGH ) - spi->cs_inactive &= ~BIT (slave->cs); +if (slave_plat->mode &SPI_CS_HIGH ) + spi->cs_inactive &= ~BIT (slave_plat->cs);else - spi->cs_inactive |=BIT (slave->cs); + spi->cs_inactive |=BIT (slave_plat->cs);writel (spi->cs_inactive, spi->regs +SIFIVE_SPI_REG_CSDEF );/* Select the correct device */ -writel (slave->cs, spi->regs +SIFIVE_SPI_REG_CSID ); +writel (slave_plat->cs, spi->regs +SIFIVE_SPI_REG_CSID ); }static int sifive_spi_set_cs (struct sifive_spi *spi, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat) {u32 cs_mode =SIFIVE_SPI_CSMODE_MODE_HOLD ; -if (slave->mode &SPI_CS_HIGH ) +if (slave_plat->mode &SPI_CS_HIGH ) cs_mode =SIFIVE_SPI_CSMODE_MODE_AUTO ;writel (cs_mode, spi->regs +SIFIVE_SPI_REG_CSMODE );@@ -128,7 +128,7 @@ static void sifive_spi_clear_cs(struct sifive_spi *spi)static void sifive_spi_prep_transfer (struct sifive_spi *spi,bool is_rx_xfer, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat) {u32 cr;@@ -141,14 +141,14 @@ static void sifive_spi_prep_transfer(struct sifive_spi *spi,/* LSB first? */ cr &= ~SIFIVE_SPI_FMT_ENDIAN ; -if (slave->mode &SPI_LSB_FIRST ) +if (slave_plat->mode &SPI_LSB_FIRST ) cr |=SIFIVE_SPI_FMT_ENDIAN ;/* Number of wires ? */ cr &= ~SIFIVE_SPI_FMT_PROTO_MASK ; -if ((slave->mode &SPI_TX_QUAD ) || (slave->mode &SPI_RX_QUAD )) +if ((slave_plat->mode &SPI_TX_QUAD ) || (slave_plat->mode &SPI_RX_QUAD )) cr |=SIFIVE_SPI_FMT_PROTO_QUAD ; -else if ((slave->mode &SPI_TX_DUAL ) || (slave->mode &SPI_RX_DUAL )) +else if ((slave_plat->mode &SPI_TX_DUAL ) || (slave_plat->mode &SPI_RX_DUAL )) cr |=SIFIVE_SPI_FMT_PROTO_DUAL ;else cr |=SIFIVE_SPI_FMT_PROTO_SINGLE ;@@ -191,21 +191,21 @@ static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, {struct udevice *bus = dev->parent;struct sifive_spi *spi =dev_get_priv (bus); -struct dm_spi_slave_platdata *slave =dev_get_parent_platdata (dev); +struct dm_spi_slave_platdata *slave_plat =dev_get_parent_platdata (dev);const unsigned char *tx_ptr = dout;u8 *rx_ptr = din;u32 remaining_len;int ret;if (flags &SPI_XFER_BEGIN ) { -sifive_spi_prep_device (spi, slave); +sifive_spi_prep_device (spi, slave_plat); - ret =sifive_spi_set_cs (spi, slave);
drivers/spi/spi-sifive.c static int sifive_spi_xfer(struct udevice *dev, unsigned int bitlen, · line 211
Quoted 10 lines
drivers/spi/spi-sifive.c +2
-1+ ret =sifive_spi_set_cs (spi, slave_plat);if (ret)return ret; } -sifive_spi_prep_transfer (spi, true, slave); +sifive_spi_prep_transfer (spi, true, slave_plat); remaining_len = bitlen /8 ;
Regards,
Bin
PATCH 1/1 spi: sifive: Tidy up dm_spi_slave_platdata variable
Quoted 23 lines · Bin Meng
Hi Jagan,
Quoted 19 lines · Jagan Teki
Usually variable name slave is used for
spi_slavestructure andplat_slavefor thedm_spi_slave_platdata.Let's follow this meaningful notation by replacing slave with
plat_slavefordm_spi_slave_platdatastructure.Signed-off-by Jagan Teki <[email protected]>--- drivers/spi/spi-sifive.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-)drivers/spi/spi-sifive.c +0
-0@@ -95,25 +95,25 @@ struct sifive_spi { };
Quoted 7 lines
drivers/spi/spi-sifive.c struct sifive_spi { · line 98
Quoted 3 lines
drivers/spi/spi-sifive.c +1
-1static void sifive_spi_prep_device (struct sifive_spi *spi, -struct dm_spi_slave_platdata *slave) +struct dm_spi_slave_platdata *slave_plat)Commit message says:
plat_slavefor thedm_spi_slave_platdata
plat_slaveorslave_plat?
slave_plat will update that, thanks.