Skip to content

Commit

Permalink
spi: xcomm: fix coding style
Browse files Browse the repository at this point in the history
Just cosmetics. No functional change intended.

While at it, removed a couple of redundant else if() statements.

Signed-off-by: Nuno Sa <nuno.sa@analog.com>
Link: https://patch.msgid.link/20240705-dev-spi-xcomm-gpiochip-v2-4-b10842fc9636@analog.com
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Nuno Sa authored and Mark Brown committed Jul 5, 2024
1 parent 5e7d475 commit e2e89f9
Showing 1 changed file with 14 additions and 14 deletions.
28 changes: 14 additions & 14 deletions drivers/spi/spi-xcomm.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ struct spi_xcomm {

struct gpio_chip gc;

uint16_t settings;
uint16_t chipselect;
u16 settings;
u16 chipselect;

unsigned int current_speed;

uint8_t buf[63];
u8 buf[63];
};

static void spi_xcomm_gpio_set_value(struct gpio_chip *chip,
Expand Down Expand Up @@ -82,8 +82,8 @@ static int spi_xcomm_gpio_add(struct spi_xcomm *spi_xcomm)

static int spi_xcomm_sync_config(struct spi_xcomm *spi_xcomm, unsigned int len)
{
uint16_t settings;
uint8_t *buf = spi_xcomm->buf;
u16 settings;
u8 *buf = spi_xcomm->buf;

settings = spi_xcomm->settings;
settings |= len << SPI_XCOMM_SETTINGS_LEN_OFFSET;
Expand All @@ -96,10 +96,10 @@ static int spi_xcomm_sync_config(struct spi_xcomm *spi_xcomm, unsigned int len)
}

static void spi_xcomm_chipselect(struct spi_xcomm *spi_xcomm,
struct spi_device *spi, int is_active)
struct spi_device *spi, int is_active)
{
unsigned long cs = spi_get_chipselect(spi, 0);
uint16_t chipselect = spi_xcomm->chipselect;
u16 chipselect = spi_xcomm->chipselect;

if (is_active)
chipselect |= BIT(cs);
Expand All @@ -110,7 +110,8 @@ static void spi_xcomm_chipselect(struct spi_xcomm *spi_xcomm,
}

static int spi_xcomm_setup_transfer(struct spi_xcomm *spi_xcomm,
struct spi_device *spi, struct spi_transfer *t, unsigned int *settings)
struct spi_device *spi, struct spi_transfer *t,
unsigned int *settings)
{
if (t->len > 62)
return -EINVAL;
Expand Down Expand Up @@ -148,7 +149,7 @@ static int spi_xcomm_setup_transfer(struct spi_xcomm *spi_xcomm,
}

static int spi_xcomm_txrx_bufs(struct spi_xcomm *spi_xcomm,
struct spi_device *spi, struct spi_transfer *t)
struct spi_device *spi, struct spi_transfer *t)
{
int ret;

Expand All @@ -159,26 +160,26 @@ static int spi_xcomm_txrx_bufs(struct spi_xcomm *spi_xcomm,
ret = i2c_master_send(spi_xcomm->i2c, spi_xcomm->buf, t->len + 1);
if (ret < 0)
return ret;
else if (ret != t->len + 1)
if (ret != t->len + 1)
return -EIO;
} else if (t->rx_buf) {
ret = i2c_master_recv(spi_xcomm->i2c, t->rx_buf, t->len);
if (ret < 0)
return ret;
else if (ret != t->len)
if (ret != t->len)
return -EIO;
}

return t->len;
}

static int spi_xcomm_transfer_one(struct spi_controller *host,
struct spi_message *msg)
struct spi_message *msg)
{
struct spi_xcomm *spi_xcomm = spi_controller_get_devdata(host);
unsigned int settings = spi_xcomm->settings;
struct spi_device *spi = msg->spi;
unsigned cs_change = 0;
unsigned int cs_change = 0;
struct spi_transfer *t;
bool is_first = true;
int status = 0;
Expand All @@ -187,7 +188,6 @@ static int spi_xcomm_transfer_one(struct spi_controller *host,
spi_xcomm_chipselect(spi_xcomm, spi, true);

list_for_each_entry(t, &msg->transfers, transfer_list) {

if (!t->tx_buf && !t->rx_buf && t->len) {
status = -EINVAL;
break;
Expand Down

0 comments on commit e2e89f9

Please sign in to comment.