openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: dsa: sja1105: Move sja1105_spi_transfer into sja1105_xfer 

This is a cosmetic patch that reduces some boilerplate in the SPI
interaction of the driver.

Signed-off-by: Vladimir Oltean <olteanv@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vladimir Oltean 2019-10-12 01:31:14 +03:00 committed by David S. Miller
parent f58a887ebc
commit 8a559400da
1 changed files with 15 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/net/dsa/sja1105/sja1105_spi.c
View File

@ -13,36 +13,6 @@
#define SJA1105_SIZE_SPI_TRANSFER_MAX \ #define SJA1105_SIZE_SPI_TRANSFER_MAX \
(SJA1105_SIZE_SPI_MSG_HEADER + SJA1105_SIZE_SPI_MSG_MAXLEN) (SJA1105_SIZE_SPI_MSG_HEADER + SJA1105_SIZE_SPI_MSG_MAXLEN)
static int sja1105_spi_transfer(const struct sja1105_private *priv,
const void *tx, void *rx, int size)
{
struct spi_device *spi = priv->spidev;
struct spi_transfer transfer = {
.tx_buf = tx,
.rx_buf = rx,
.len = size,
};
struct spi_message msg;
int rc;
if (size > SJA1105_SIZE_SPI_TRANSFER_MAX) {
dev_err(&spi->dev, "SPI message (%d) longer than max of %d\n",
size, SJA1105_SIZE_SPI_TRANSFER_MAX);
return -EMSGSIZE;
}
spi_message_init(&msg);
spi_message_add_tail(&transfer, &msg);
rc = spi_sync(spi, &msg);
if (rc < 0) {
dev_err(&spi->dev, "SPI transfer failed: %d\n", rc);
return rc;
}
return rc;
}
static void static void
sja1105_spi_message_pack(void *buf, const struct sja1105_spi_message *msg) sja1105_spi_message_pack(void *buf, const struct sja1105_spi_message *msg)
{ {
@ -69,10 +39,17 @@ int sja1105_xfer_buf(const struct sja1105_private *priv,
sja1105_spi_rw_mode_t rw, u64 reg_addr, sja1105_spi_rw_mode_t rw, u64 reg_addr,
void *packed_buf, size_t size_bytes) void *packed_buf, size_t size_bytes)
{ {
const int msg_len = size_bytes + SJA1105_SIZE_SPI_MSG_HEADER;
u8 tx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0}; u8 tx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};
u8 rx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0}; u8 rx_buf[SJA1105_SIZE_SPI_TRANSFER_MAX] = {0};
const int msg_len = size_bytes + SJA1105_SIZE_SPI_MSG_HEADER; struct spi_device *spi = priv->spidev;
struct sja1105_spi_message msg = {0}; struct sja1105_spi_message msg = {0};
struct spi_transfer xfer = {
.tx_buf = tx_buf,
.rx_buf = rx_buf,
.len = msg_len,
};
struct spi_message m;
int rc; int rc;
if (msg_len > SJA1105_SIZE_SPI_TRANSFER_MAX) if (msg_len > SJA1105_SIZE_SPI_TRANSFER_MAX)
@ -89,9 +66,14 @@ int sja1105_xfer_buf(const struct sja1105_private *priv,
memcpy(tx_buf + SJA1105_SIZE_SPI_MSG_HEADER, memcpy(tx_buf + SJA1105_SIZE_SPI_MSG_HEADER,
packed_buf, size_bytes); packed_buf, size_bytes);
rc = sja1105_spi_transfer(priv, tx_buf, rx_buf, msg_len); spi_message_init(&m);
if (rc < 0) spi_message_add_tail(&xfer, &m);
rc = spi_sync(spi, &m);
if (rc < 0) {
dev_err(&spi->dev, "SPI transfer failed: %d\n", rc);
return rc; return rc;
}
if (rw == SPI_READ) if (rw == SPI_READ)
memcpy(packed_buf, rx_buf + SJA1105_SIZE_SPI_MSG_HEADER, memcpy(packed_buf, rx_buf + SJA1105_SIZE_SPI_MSG_HEADER,