diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2019-10-01 18:07:50 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2019-12-02 14:22:40 +0100 |
| commit | d468995a679f70d7904202fde3573e4d90ba183b (patch) | |
| tree | ee588132d36818b1e243b368fff2156b2a6e0324 /drivers/net | |
| parent | e282252ad0840c0cceb69c95f736bd72c16bccba (diff) | |
can: mcp25xxfd: fix checkpatch warnings
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
(cherry picked from commit ed57b613fa490cc9c85ddfc8ff00c2ff951581d3)
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_int.c | 14 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/mcp25xxfd_clock.c | 2 | ||||
| -rw-r--r-- | drivers/net/can/spi/mcp25xxfd/mcp25xxfd_gpio.c | 5 |
3 files changed, 13 insertions, 8 deletions
diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_int.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_int.c index 3625567ffa15..7cd655eedc0a 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_int.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_can_int.c @@ -530,13 +530,18 @@ static int mcp25xxfd_can_int_error_handling(struct mcp25xxfd_can_priv *cpriv) return 0; } - static int mcp25xxfd_can_int_handle_status(struct mcp25xxfd_can_priv *cpriv) { char *errfunc; int ret; -#define HANDLE_ERROR(name) if (ret) { errfunc = name; goto err; } +#define HANDLE_ERROR(name) \ + do { \ + if (ret) { \ + errfunc = name; \ + goto err; \ + } \ + } while (0) /* clear all the interrupts asap - we have them on file allready */ ret = mcp25xxfd_can_int_clear_int_flags(cpriv); @@ -607,6 +612,7 @@ err: errfunc, ret); return ret; } + #undef HANDLE_ERROR irqreturn_t mcp25xxfd_can_int(int irq, void *dev_id) @@ -671,9 +677,9 @@ irqreturn_t mcp25xxfd_can_int(int irq, void *dev_id) return IRQ_HANDLED; fail: - netdev_err(cpriv->can.dev, + netdev_err(cpriv->can.dev, "experienced unexpected error %i in interrupt handler - disabling interrupts\n", - ret); + ret); /* note that if we experienced an spi error, * then this would produce another error */ diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_clock.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_clock.c index 03ba25276aa4..e33def233630 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_clock.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_clock.c @@ -292,7 +292,7 @@ static int _mcp25xxfd_clock_probe(struct mcp25xxfd_priv *priv) /* check clock register that the clock is ready or disabled */ ret = mcp25xxfd_cmd_read_regs(priv->spi, MCP25XXFD_OSC | MCP25XXFD_ADDRESS_WITH_CRC, - &priv->regs.osc,4); + &priv->regs.osc, 4); if (ret == -EILSEQ) dev_err(&priv->spi->dev, "CRC read of clock register resulted in a bad CRC mismatch - hw not found\n"); diff --git a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_gpio.c b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_gpio.c index 60dc9f98d892..e145f861dd47 100644 --- a/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_gpio.c +++ b/drivers/net/can/spi/mcp25xxfd/mcp25xxfd_gpio.c @@ -182,11 +182,10 @@ static void mcp25xxfd_gpio_read_of(struct mcp25xxfd_priv *priv) static int mcp25xxfd_gpio_setup_regs(struct mcp25xxfd_priv *priv) { /* handle open-drain */ - if (priv->config.gpio_open_drain) { + if (priv->config.gpio_open_drain) priv->regs.iocon |= MCP25XXFD_IOCON_INTOD; - } else { + else priv->regs.iocon &= ~MCP25XXFD_IOCON_INTOD; - } /* handle xstandby */ if (priv->config.gpio0_xstandby) { |