From: Sam Asadi <[email protected]>
fixed a coding style issue.
Signed-off-by: Sam Asadi <[email protected]>
modified: drivers/staging/comedi/drivers/8255.c
---
drivers/staging/comedi/drivers/8255.c | 150 ++++++++++++++++-----------------
1 file changed, 74 insertions(+), 76 deletions(-)
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
index 46113a3..de273c7 100644
--- a/drivers/staging/comedi/drivers/8255.c
+++ b/drivers/staging/comedi/drivers/8255.c
@@ -1,77 +1,73 @@
/*
- comedi/drivers/8255.c
- Driver for 8255
-
- COMEDI - Linux Control and Measurement Device Interface
- Copyright (C) 1998 David A. Schleef <[email protected]>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ comedi/drivers/8255.c
+ Driver for 8255
+
+ COMEDI - Linux Control and Measurement Device Interface
+ Copyright (C) 1998 David A. Schleef <[email protected]>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ Driver: 8255
+ Description: generic 8255 support
+ Devices: [standard] 8255 (8255)
+ Author: ds
+ Status: works
+ Updated: Fri, 7 Jun 2002 12:56:45 -0700
+
+ The classic in digital I/O. The 8255 appears in Comedi as a single
+ digital I/O subdevice with 24 channels. The channel 0 corresponds
+ to the 8255's port A, bit 0; channel 23 corresponds to port C, bit
+ 7. Direction configuration is done in blocks, with channels 0-7,
+ 8-15, 16-19, and 20-23 making up the 4 blocks. The only 8255 mode
+ supported is mode 0.
+
+ You should enable compilation this driver if you plan to use a board
+ that has an 8255 chip. For multifunction boards, the main driver will
+ configure the 8255 subdevice automatically.
+
+ This driver also works independently with ISA and PCI cards that
+ directly map the 8255 registers to I/O ports, including cards with
+ multiple 8255 chips. To configure the driver for such a card, the
+ option list should be a list of the I/O port bases for each of the
+ 8255 chips. For example,
+
+ comedi_config /dev/comedi0 8255 0x200,0x204,0x208,0x20c
+
+ Note that most PCI 8255 boards do NOT work with this driver, and
+ need a separate driver as a wrapper. For those that do work, the
+ I/O port base address can be found in the output of 'lspci -v'.
+
+ This file contains an exported subdevice for driving an 8255.
+
+ To use this subdevice as part of another driver, you need to
+ set up the subdevice in the attach function of the driver by
+ calling:
+
+ subdev_8255_init(device, subdevice, io_function, iobase)
+
+ device and subdevice are pointers to the device and subdevice
+ structures. io_function will be called to provide the
+ low-level input/output to the device, i.e., actual register
+ access. io_function will be called with the value of iobase
+ as the last parameter. If the 8255 device is mapped as 4
+ consecutive I/O ports, you can use NULL for io_function
+ and the I/O port base for iobase, and an internal function will
+ handle the register access.
+
+ In addition, if the main driver handles interrupts, you can
+ enable commands on the subdevice by calling subdev_8255_init_irq()
+ instead. Then, when you get an interrupt that is likely to be
+ from the 8255, you should call subdev_8255_interrupt(), which
+ will copy the latched value to a Comedi buffer.
*/
-/*
-Driver: 8255
-Description: generic 8255 support
-Devices: [standard] 8255 (8255)
-Author: ds
-Status: works
-Updated: Fri, 7 Jun 2002 12:56:45 -0700
-
-The classic in digital I/O. The 8255 appears in Comedi as a single
-digital I/O subdevice with 24 channels. The channel 0 corresponds
-to the 8255's port A, bit 0; channel 23 corresponds to port C, bit
-7. Direction configuration is done in blocks, with channels 0-7,
-8-15, 16-19, and 20-23 making up the 4 blocks. The only 8255 mode
-supported is mode 0.
-
-You should enable compilation this driver if you plan to use a board
-that has an 8255 chip. For multifunction boards, the main driver will
-configure the 8255 subdevice automatically.
-
-This driver also works independently with ISA and PCI cards that
-directly map the 8255 registers to I/O ports, including cards with
-multiple 8255 chips. To configure the driver for such a card, the
-option list should be a list of the I/O port bases for each of the
-8255 chips. For example,
-
- comedi_config /dev/comedi0 8255 0x200,0x204,0x208,0x20c
-
-Note that most PCI 8255 boards do NOT work with this driver, and
-need a separate driver as a wrapper. For those that do work, the
-I/O port base address can be found in the output of 'lspci -v'.
-
-*/
-
-/*
- This file contains an exported subdevice for driving an 8255.
-
- To use this subdevice as part of another driver, you need to
- set up the subdevice in the attach function of the driver by
- calling:
-
- subdev_8255_init(device, subdevice, io_function, iobase)
-
- device and subdevice are pointers to the device and subdevice
- structures. io_function will be called to provide the
- low-level input/output to the device, i.e., actual register
- access. io_function will be called with the value of iobase
- as the last parameter. If the 8255 device is mapped as 4
- consecutive I/O ports, you can use NULL for io_function
- and the I/O port base for iobase, and an internal function will
- handle the register access.
-
- In addition, if the main driver handles interrupts, you can
- enable commands on the subdevice by calling subdev_8255_init_irq()
- instead. Then, when you get an interrupt that is likely to be
- from the 8255, you should call subdev_8255_interrupt(), which
- will copy the latched value to a Comedi buffer.
- */
#include <linux/module.h>
#include "../comedidev.h"
@@ -94,6 +90,7 @@ I/O port base address can be found in the output of 'lspci -v'.
struct subdev_8255_private {
unsigned long iobase;
+
int (*io)(int, int, int, unsigned long);
};
@@ -102,9 +99,8 @@ static int subdev_8255_io(int dir, int port, int data, unsigned long iobase)
if (dir) {
outb(data, iobase + port);
return 0;
- } else {
+ } else
return inb(iobase + port);
- }
}
void subdev_8255_interrupt(struct comedi_device *dev,
@@ -309,9 +305,9 @@ EXPORT_SYMBOL_GPL(subdev_8255_init_irq);
/*
- Start of the 8255 standalone device
+ Start of the 8255 standalone device
- */
+*/
static int dev_8255_attach(struct comedi_device *dev,
struct comedi_devconfig *it)
@@ -373,8 +369,10 @@ static struct comedi_driver dev_8255_driver = {
.attach = dev_8255_attach,
.detach = dev_8255_detach,
};
+
module_comedi_driver(dev_8255_driver);
MODULE_AUTHOR("Comedi http://www.comedi.org");
MODULE_DESCRIPTION("Comedi low-level driver");
MODULE_LICENSE("GPL");
+
--
1.7.10.4
On 2014-07-15 04:15, sam-the-6 wrote:
> From: Sam Asadi <[email protected]>
>
> fixed a coding style issue.
>
> Signed-off-by: Sam Asadi <[email protected]>
> modified: drivers/staging/comedi/drivers/8255.c
> ---
> drivers/staging/comedi/drivers/8255.c | 150 ++++++++++++++++-----------------
> 1 file changed, 74 insertions(+), 76 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c
> index 46113a3..de273c7 100644
> --- a/drivers/staging/comedi/drivers/8255.c
> +++ b/drivers/staging/comedi/drivers/8255.c
> @@ -1,77 +1,73 @@
> /*
> - comedi/drivers/8255.c
> - Driver for 8255
> -
> - COMEDI - Linux Control and Measurement Device Interface
> - Copyright (C) 1998 David A. Schleef <[email protected]>
> -
> - This program is free software; you can redistribute it and/or modify
> - it under the terms of the GNU General Public License as published by
> - the Free Software Foundation; either version 2 of the License, or
> - (at your option) any later version.
> -
> - This program is distributed in the hope that it will be useful,
> - but WITHOUT ANY WARRANTY; without even the implied warranty of
> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> - GNU General Public License for more details.
> + comedi/drivers/8255.c
> + Driver for 8255
> +
> + COMEDI - Linux Control and Measurement Device Interface
> + Copyright (C) 1998 David A. Schleef <[email protected]>
> +
> + This program is free software; you can redistribute it and/or modify
> + it under the terms of the GNU General Public License as published by
> + the Free Software Foundation; either version 2 of the License, or
> + (at your option) any later version.
> +
> + This program is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + GNU General Public License for more details.
> +
> + Driver: 8255
> + Description: generic 8255 support
> + Devices: [standard] 8255 (8255)
> + Author: ds
> + Status: works
> + Updated: Fri, 7 Jun 2002 12:56:45 -0700
> +
> + The classic in digital I/O. The 8255 appears in Comedi as a single
> + digital I/O subdevice with 24 channels. The channel 0 corresponds
> + to the 8255's port A, bit 0; channel 23 corresponds to port C, bit
> + 7. Direction configuration is done in blocks, with channels 0-7,
> + 8-15, 16-19, and 20-23 making up the 4 blocks. The only 8255 mode
> + supported is mode 0.
> +
> + You should enable compilation this driver if you plan to use a board
> + that has an 8255 chip. For multifunction boards, the main driver will
> + configure the 8255 subdevice automatically.
> +
> + This driver also works independently with ISA and PCI cards that
> + directly map the 8255 registers to I/O ports, including cards with
> + multiple 8255 chips. To configure the driver for such a card, the
> + option list should be a list of the I/O port bases for each of the
> + 8255 chips. For example,
> +
> + comedi_config /dev/comedi0 8255 0x200,0x204,0x208,0x20c
> +
> + Note that most PCI 8255 boards do NOT work with this driver, and
> + need a separate driver as a wrapper. For those that do work, the
> + I/O port base address can be found in the output of 'lspci -v'.
> +
> + This file contains an exported subdevice for driving an 8255.
> +
> + To use this subdevice as part of another driver, you need to
> + set up the subdevice in the attach function of the driver by
> + calling:
> +
> + subdev_8255_init(device, subdevice, io_function, iobase)
> +
> + device and subdevice are pointers to the device and subdevice
> + structures. io_function will be called to provide the
> + low-level input/output to the device, i.e., actual register
> + access. io_function will be called with the value of iobase
> + as the last parameter. If the 8255 device is mapped as 4
> + consecutive I/O ports, you can use NULL for io_function
> + and the I/O port base for iobase, and an internal function will
> + handle the register access.
> +
> + In addition, if the main driver handles interrupts, you can
> + enable commands on the subdevice by calling subdev_8255_init_irq()
> + instead. Then, when you get an interrupt that is likely to be
> + from the 8255, you should call subdev_8255_interrupt(), which
> + will copy the latched value to a Comedi buffer.
> */
> -/*
> -Driver: 8255
> -Description: generic 8255 support
> -Devices: [standard] 8255 (8255)
> -Author: ds
> -Status: works
> -Updated: Fri, 7 Jun 2002 12:56:45 -0700
> -
> -The classic in digital I/O. The 8255 appears in Comedi as a single
> -digital I/O subdevice with 24 channels. The channel 0 corresponds
> -to the 8255's port A, bit 0; channel 23 corresponds to port C, bit
> -7. Direction configuration is done in blocks, with channels 0-7,
> -8-15, 16-19, and 20-23 making up the 4 blocks. The only 8255 mode
> -supported is mode 0.
> -
> -You should enable compilation this driver if you plan to use a board
> -that has an 8255 chip. For multifunction boards, the main driver will
> -configure the 8255 subdevice automatically.
> -
> -This driver also works independently with ISA and PCI cards that
> -directly map the 8255 registers to I/O ports, including cards with
> -multiple 8255 chips. To configure the driver for such a card, the
> -option list should be a list of the I/O port bases for each of the
> -8255 chips. For example,
> -
> - comedi_config /dev/comedi0 8255 0x200,0x204,0x208,0x20c
> -
> -Note that most PCI 8255 boards do NOT work with this driver, and
> -need a separate driver as a wrapper. For those that do work, the
> -I/O port base address can be found in the output of 'lspci -v'.
> -
> -*/
> -
> -/*
> - This file contains an exported subdevice for driving an 8255.
> -
> - To use this subdevice as part of another driver, you need to
> - set up the subdevice in the attach function of the driver by
> - calling:
> -
> - subdev_8255_init(device, subdevice, io_function, iobase)
> -
> - device and subdevice are pointers to the device and subdevice
> - structures. io_function will be called to provide the
> - low-level input/output to the device, i.e., actual register
> - access. io_function will be called with the value of iobase
> - as the last parameter. If the 8255 device is mapped as 4
> - consecutive I/O ports, you can use NULL for io_function
> - and the I/O port base for iobase, and an internal function will
> - handle the register access.
> -
> - In addition, if the main driver handles interrupts, you can
> - enable commands on the subdevice by calling subdev_8255_init_irq()
> - instead. Then, when you get an interrupt that is likely to be
> - from the 8255, you should call subdev_8255_interrupt(), which
> - will copy the latched value to a Comedi buffer.
> - */
Please format those as three separate comments in the usual block
comment style:
/*
* Multi
* line
* comment
*/
>
> #include <linux/module.h>
> #include "../comedidev.h"
> @@ -94,6 +90,7 @@ I/O port base address can be found in the output of 'lspci -v'.
>
> struct subdev_8255_private {
> unsigned long iobase;
> +
> int (*io)(int, int, int, unsigned long);
> };
>
> @@ -102,9 +99,8 @@ static int subdev_8255_io(int dir, int port, int data, unsigned long iobase)
> if (dir) {
> outb(data, iobase + port);
> return 0;
> - } else {
> + } else
> return inb(iobase + port);
> - }
> }
If either the 'if' or the 'else' use braces, the other one should too.
>
> void subdev_8255_interrupt(struct comedi_device *dev,
> @@ -309,9 +305,9 @@ EXPORT_SYMBOL_GPL(subdev_8255_init_irq);
>
> /*
>
> - Start of the 8255 standalone device
> + Start of the 8255 standalone device
>
> - */
> +*/
Please use the usual block comment style.
>
> static int dev_8255_attach(struct comedi_device *dev,
> struct comedi_devconfig *it)
> @@ -373,8 +369,10 @@ static struct comedi_driver dev_8255_driver = {
> .attach = dev_8255_attach,
> .detach = dev_8255_detach,
> };
> +
> module_comedi_driver(dev_8255_driver);
>
> MODULE_AUTHOR("Comedi http://www.comedi.org");
> MODULE_DESCRIPTION("Comedi low-level driver");
> MODULE_LICENSE("GPL");
> +
>
Extra blank line is unnecessary.
--
-=( Ian Abbott @ MEV Ltd. E-mail: <[email protected]> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
On Tue, Jul 15, 2014 at 06:15:44AM +0300, sam-the-6 wrote:
> From: Sam Asadi <[email protected]>
>
> fixed a coding style issue.
Your Subject: does not match the body of the patch at all, why not?
Please be descriptive as to what you are doing.
Also, only do one thing per patch, and "one thing" is NOT "fix all
coding style issues".
Please redo this whole series, starting with the numbering of them, and
break them up into individual changes, not large patches.
thanks,
greg k-h