diff options
author | Kumar Amit Mehta <gmate.amit@gmail.com> | 2012-11-07 04:08:09 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-13 11:49:55 -0800 |
commit | 7803d8e05d63d743e938233eb49fd8f112dfb07e (patch) | |
tree | 3774d3454fddf67200bbfe3d9bc361894257d78f /drivers/staging/comedi/drivers/jr3_pci.c | |
parent | c965c8b7d2538d10d77a320e84ddbe51d221f373 (diff) |
staging: comedi: drivers: jr3_pci.c: fix for coding style issue
fixed few error and warning messages as reported by checkpatch.pl
Signed-off-by: Kumar Amit Mehta <gmate.amit@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/jr3_pci.c')
-rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 69f151d62f3b..65d65fe23d6e 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -360,7 +360,7 @@ static int read_idm_word(const u8 *data, size_t size, int *pos, return result; } -static int jr3_download_firmware(struct comedi_device *dev, const u8 * data, +static int jr3_download_firmware(struct comedi_device *dev, const u8 *data, size_t size) { /* @@ -470,14 +470,13 @@ static struct poll_delay_t jr3_pci_poll_subdevice(struct comedi_subdevice *s) struct jr3_channel __iomem *channel = p->channel; int errors = get_u16(&channel->errors); - if (errors != p->errors) { + if (errors != p->errors) p->errors = errors; - } - if (errors & (watch_dog | watch_dog2 | sensor_change)) { + + if (errors & (watch_dog | watch_dog2 | sensor_change)) /* Sensor communication lost, force poll mode */ p->state = state_jr3_poll; - } switch (p->state) { case state_jr3_poll: { u16 model_no = get_u16(&channel->model_no); |