| Message ID | 1452275039-18787-14-git-send-email-anton.wuerfel@fau.de (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Headers | show |
On Fri, 2016-01-08 at 18:43 +0100, Anton Wuerfel wrote: > Checkpatch complains about incorrect indentation of switch/case > statements. > This patch fixes the corresponding warnings. Additionally some > indentation > is changed to match the correct format specified in the Linux Kernel > Coding Style. > > Signed-off-by: Anton Würfel <anton.wuerfel@fau.de> > Signed-off-by: Phillip Raffeck <phillip.raffeck@fau.de> > CC: linux-kernel@i4.cs.fau.de > --- > drivers/tty/serial/8250/8250_pci.c | 12 ++++++------ > drivers/tty/serial/8250/8250_pnp.c | 4 ++-- > drivers/tty/serial/8250/8250_port.c | 6 +++--- > 3 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_pci.c > b/drivers/tty/serial/8250/8250_pci.c > index 09157fa..b0b47f9 100644 > --- a/drivers/tty/serial/8250/8250_pci.c > +++ b/drivers/tty/serial/8250/8250_pci.c > @@ -841,12 +841,12 @@ static int pci_netmos_init(struct pci_dev *dev) > return 0; > > switch (dev->device) { /* FALLTHROUGH on all */ > - case PCI_DEVICE_ID_NETMOS_9904: > - case PCI_DEVICE_ID_NETMOS_9912: > - case PCI_DEVICE_ID_NETMOS_9922: > - case PCI_DEVICE_ID_NETMOS_9900: > - num_serial = pci_netmos_9900_numports(dev); > - break; > + case PCI_DEVICE_ID_NETMOS_9904: > + case PCI_DEVICE_ID_NETMOS_9912: > + case PCI_DEVICE_ID_NETMOS_9922: > + case PCI_DEVICE_ID_NETMOS_9900: > + num_serial = pci_netmos_9900_numports(dev); > + break; > > default: You forget to shift above line as well. > if (num_serial == 0) { But before doing that I would suggest to refactor the warning message below in the code: copy it out of 'default:' to below condition and replace by 'break;' inside the switch-case.
diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c index 09157fa..b0b47f9 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -841,12 +841,12 @@ static int pci_netmos_init(struct pci_dev *dev) return 0; switch (dev->device) { /* FALLTHROUGH on all */ - case PCI_DEVICE_ID_NETMOS_9904: - case PCI_DEVICE_ID_NETMOS_9912: - case PCI_DEVICE_ID_NETMOS_9922: - case PCI_DEVICE_ID_NETMOS_9900: - num_serial = pci_netmos_9900_numports(dev); - break; + case PCI_DEVICE_ID_NETMOS_9904: + case PCI_DEVICE_ID_NETMOS_9912: + case PCI_DEVICE_ID_NETMOS_9922: + case PCI_DEVICE_ID_NETMOS_9900: + num_serial = pci_netmos_9900_numports(dev); + break; default: if (num_serial == 0) { diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c index e99282f..a021e31 100644 --- a/drivers/tty/serial/8250/8250_pnp.c +++ b/drivers/tty/serial/8250/8250_pnp.c @@ -427,8 +427,8 @@ static int check_resources(struct pnp_dev *dev) static int serial_pnp_guess_board(struct pnp_dev *dev) { if (!(check_name(pnp_dev_name(dev)) || - (dev->card && check_name(dev->card->name)))) - return -ENODEV; + (dev->card && check_name(dev->card->name)))) + return -ENODEV; if (check_resources(dev)) return 0; diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index 343d050..da3b240 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -2235,9 +2235,9 @@ static void serial8250_set_divisor(struct uart_port *port, unsigned int baud, serial_port_out(port, 0x2, quot_frac); } -static unsigned int -serial8250_get_baud_rate(struct uart_port *port, struct ktermios *termios, - struct ktermios *old) +static unsigned int serial8250_get_baud_rate(struct uart_port *port, + struct ktermios *termios, + struct ktermios *old) { unsigned int tolerance = port->uartclk / 100;