Re: [PATCH] Staging: comedi: fix brace coding style issue in jr3_pci.c This is a patch to the jr3_pci.c file that fixes up a brace warning found by the checkpatch.pl tool Signed-off-by: Stephane Pajot <pajot.stephane@xxxxxxxxx>

[Andy Shevchenko <andy.shevchenko@xxxxxxxxx>]

On Mon, May 9, 2011 at 4:51 PM, Stephane Pajot <pajot.stephane@xxxxxxxxx> wrote:

Please, split the subject and description with Signed-off-by lines.

> ---
> Âdrivers/staging/comedi/drivers/jr3_pci.c | Â 27 +++++++++------------------
> Â1 files changed, 9 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c
> index 5c6c727..d96140c 100644
> --- a/drivers/staging/comedi/drivers/jr3_pci.c
> +++ b/drivers/staging/comedi/drivers/jr3_pci.c
> @@ -193,9 +193,8 @@ static void set_transforms(volatile struct jr3_channel *channel,
> Â Â Â Â Â Â Â Âset_s16(&channel->transforms[num].link[i].link_amount,
> Â Â Â Â Â Â Â Â Â Â Â Âtransf.link[i].link_amount);
> Â Â Â Â Â Â Â Âudelay(1);
> - Â Â Â Â Â Â Â if (transf.link[i].link_type == end_x_form) {
> + Â Â Â Â Â Â Â if (transf.link[i].link_type == end_x_form)
> Â Â Â Â Â Â Â Â Â Â Â Âbreak;
> - Â Â Â Â Â Â Â }
> Â Â Â Â}
> Â}
>
> @@ -460,9 +459,8 @@ static int jr3_download_firmware(struct comedi_device *dev, const u8 * data,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âunsigned int count, addr;
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âmore = more
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â&& read_idm_word(data, size, &pos, &count);
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (more && count == 0xffff) {
> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (more && count == 0xffff)
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âbreak;
> - Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âmore = more
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â&& read_idm_word(data, size, &pos, &addr);
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âprintk("Loading#%d %4.4x bytes at %4.4x\n", i,
> @@ -793,9 +791,8 @@ static int jr3_pci_attach(struct comedi_device *dev,
> Â Â Â Â}
>
> Â Â Â Âresult = alloc_private(dev, sizeof(struct jr3_pci_dev_private));
> - Â Â Â if (result < 0) {
> + Â Â Â if (result < 0)
> Â Â Â Â Â Â Â Âreturn -ENOMEM;
> - Â Â Â }
> Â Â Â Âcard = NULL;
> Â Â Â Âdevpriv = dev->private;
> Â Â Â Âinit_timer(&devpriv->timer);
> @@ -851,9 +848,8 @@ static int jr3_pci_attach(struct comedi_device *dev,
> Â Â Â Â}
>
> Â Â Â Âresult = comedi_pci_enable(card, "jr3_pci");
> - Â Â Â if (result < 0) {
> + Â Â Â if (result < 0)
> Â Â Â Â Â Â Â Âreturn -EIO;
> - Â Â Â }
>
> Â Â Â Âdevpriv->pci_enabled = 1;
> Â Â Â Âdevpriv->iobase = ioremap(pci_resource_start(card, 0),
> @@ -922,9 +918,8 @@ static int jr3_pci_attach(struct comedi_device *dev,
> Â Â Â Âresult = comedi_load_firmware(dev, "jr3pci.idm", jr3_download_firmware);
> Â Â Â Âprintk("Firmare load %d\n", result);
>
> - Â Â Â if (result < 0) {
> + Â Â Â if (result < 0)
> Â Â Â Â Â Â Â Âgoto out;
> - Â Â Â }
I guess it better to leave blank line here.

> Â/*
> Â* TODO: use firmware to load preferred offset tables. Suggested
> Â* format:
> @@ -973,21 +968,17 @@ static int jr3_pci_detach(struct comedi_device *dev)
> Â Â Â Â Â Â Â Âdel_timer_sync(&devpriv->timer);
>
> Â Â Â Â Â Â Â Âif (dev->subdevices) {
> - Â Â Â Â Â Â Â Â Â Â Â for (i = 0; i < devpriv->n_channels; i++) {
> + Â Â Â Â Â Â Â Â Â Â Â for (i = 0; i < devpriv->n_channels; i++)
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Âkfree(dev->subdevices[i].private);
> - Â Â Â Â Â Â Â Â Â Â Â }
> Â Â Â Â Â Â Â Â}
>
> - Â Â Â Â Â Â Â if (devpriv->iobase) {
> + Â Â Â Â Â Â Â if (devpriv->iobase)
> Â Â Â Â Â Â Â Â Â Â Â Âiounmap((void *)devpriv->iobase);
> - Â Â Â Â Â Â Â }
> - Â Â Â Â Â Â Â if (devpriv->pci_enabled) {
> + Â Â Â Â Â Â Â if (devpriv->pci_enabled)
> Â Â Â Â Â Â Â Â Â Â Â Âcomedi_pci_disable(devpriv->pci_dev);
> - Â Â Â Â Â Â Â }
>
> - Â Â Â Â Â Â Â if (devpriv->pci_dev) {
> + Â Â Â Â Â Â Â if (devpriv->pci_dev)
> Â Â Â Â Â Â Â Â Â Â Â Âpci_dev_put(devpriv->pci_dev);
> - Â Â Â Â Â Â Â }
> Â Â Â Â}
> Â Â Â Âreturn 0;
> Â}
> --
> 1.7.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html
> Please read the FAQ at Âhttp://www.tux.org/lkml/
>



-- 
With Best Regards,
Andy Shevchenko
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel