* [PATCH] Staging: comedi: Simplify a trivial if-return sequence
@ 2015-06-16 7:58 Abdul, Hussain (H.)
2015-06-16 13:11 ` Ian Abbott
0 siblings, 1 reply; 3+ messages in thread
From: Abdul, Hussain (H.) @ 2015-06-16 7:58 UTC (permalink / raw)
To: gregkh@linuxfoundation.org
Cc: abbotti@mev.co.uk, hsweeten@visionengravers.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Ravindran, Madhusudhanan (M.), Dighe, Niranjan (N.)
From: Abdul Hussain <habdul@visteon.com>
This patch simplify a trivial if-return sequence. Possibly combine with
a preceding function call.
Signed-off-by: Abdul Hussain <habdul@visteon.com>
---
drivers/staging/comedi/drivers/dac02.c | 6 +-----
drivers/staging/comedi/drivers/daqboard2000.c | 6 +-----
drivers/staging/comedi/drivers/dmm32at.c | 6 +-----
drivers/staging/comedi/drivers/fl512.c | 6 +-----
drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +-----
drivers/staging/comedi/drivers/s626.c | 6 +-----
6 files changed, 6 insertions(+), 30 deletions(-)
diff --git a/drivers/staging/comedi/drivers/dac02.c b/drivers/staging/comedi/drivers/dac02.c
index a6798ad..a562df4 100644
--- a/drivers/staging/comedi/drivers/dac02.c
+++ b/drivers/staging/comedi/drivers/dac02.c
@@ -130,11 +130,7 @@ static int dac02_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &das02_ao_ranges;
s->insn_write = dac02_ao_insn_write;
- ret = comedi_alloc_subdev_readback(s);
- if (ret)
- return ret;
-
- return 0;
+ return comedi_alloc_subdev_readback(s);
}
static struct comedi_driver dac02_driver = {
diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 611b0a3..0fe40c2 100644
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -713,12 +713,8 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
return result;
s = &dev->subdevices[2];
- result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
+ return subdev_8255_init(dev, s, daqboard2000_8255_cb,
dioP2ExpansionIO8Bit);
- if (result)
- return result;
-
- return 0;
}
static void daqboard2000_detach(struct comedi_device *dev)
diff --git a/drivers/staging/comedi/drivers/dmm32at.c b/drivers/staging/comedi/drivers/dmm32at.c
index bb2883c..958c0d4 100644
--- a/drivers/staging/comedi/drivers/dmm32at.c
+++ b/drivers/staging/comedi/drivers/dmm32at.c
@@ -607,11 +607,7 @@ static int dmm32at_attach(struct comedi_device *dev,
/* Digital I/O subdevice */
s = &dev->subdevices[2];
- ret = subdev_8255_init(dev, s, dmm32at_8255_io, DMM32AT_8255_IOBASE);
- if (ret)
- return ret;
-
- return 0;
+ return subdev_8255_init(dev, s, dmm32at_8255_io, DMM32AT_8255_IOBASE);
}
static struct comedi_driver dmm32at_driver = {
diff --git a/drivers/staging/comedi/drivers/fl512.c b/drivers/staging/comedi/drivers/fl512.c
index e1f4932..55cae61 100644
--- a/drivers/staging/comedi/drivers/fl512.c
+++ b/drivers/staging/comedi/drivers/fl512.c
@@ -136,11 +136,7 @@ static int fl512_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->range_table = &range_fl512;
s->insn_write = fl512_ao_insn_write;
- ret = comedi_alloc_subdev_readback(s);
- if (ret)
- return ret;
-
- return 0;
+ return comedi_alloc_subdev_readback(s);
}
static struct comedi_driver fl512_driver = {
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c
index a208cb3..d9de83a 100644
--- a/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -55,11 +55,7 @@ static int dio24_auto_attach(struct comedi_device *dev,
/* 8255 dio */
s = &dev->subdevices[0];
- ret = subdev_8255_init(dev, s, NULL, 0x00);
- if (ret)
- return ret;
-
- return 0;
+ return subdev_8255_init(dev, s, NULL, 0x00);
}
static struct comedi_driver driver_dio24 = {
diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c
index 781918d..35f0f67 100644
--- a/drivers/staging/comedi/drivers/s626.c
+++ b/drivers/staging/comedi/drivers/s626.c
@@ -2852,11 +2852,7 @@ static int s626_auto_attach(struct comedi_device *dev,
s->insn_read = s626_enc_insn_read;
s->insn_write = s626_enc_insn_write;
- ret = s626_initialize(dev);
- if (ret)
- return ret;
-
- return 0;
+ return s626_initialize(dev);
}
static void s626_detach(struct comedi_device *dev)
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: Simplify a trivial if-return sequence
2015-06-16 7:58 [PATCH] Staging: comedi: Simplify a trivial if-return sequence Abdul, Hussain (H.)
@ 2015-06-16 13:11 ` Ian Abbott
2015-06-16 14:08 ` Abdul, Hussain (H.)
0 siblings, 1 reply; 3+ messages in thread
From: Ian Abbott @ 2015-06-16 13:11 UTC (permalink / raw)
To: Abdul, Hussain (H.), gregkh@linuxfoundation.org
Cc: hsweeten@visionengravers.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, Ravindran, Madhusudhanan (M.),
Dighe, Niranjan (N.)
On 16/06/15 08:58, Abdul, Hussain (H.) wrote:
> From: Abdul Hussain <habdul@visteon.com>
>
> This patch simplify a trivial if-return sequence. Possibly combine with
> a preceding function call.
>
> Signed-off-by: Abdul Hussain <habdul@visteon.com>
> ---
> drivers/staging/comedi/drivers/dac02.c | 6 +-----
> drivers/staging/comedi/drivers/daqboard2000.c | 6 +-----
> drivers/staging/comedi/drivers/dmm32at.c | 6 +-----
> drivers/staging/comedi/drivers/fl512.c | 6 +-----
> drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +-----
> drivers/staging/comedi/drivers/s626.c | 6 +-----
> 6 files changed, 6 insertions(+), 30 deletions(-)
>
Ideally, this should be split into separate patches.
[snip]
> diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
> index 611b0a3..0fe40c2 100644
> --- a/drivers/staging/comedi/drivers/daqboard2000.c
> +++ b/drivers/staging/comedi/drivers/daqboard2000.c
> @@ -713,12 +713,8 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
> return result;
>
> s = &dev->subdevices[2];
> - result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
> + return subdev_8255_init(dev, s, daqboard2000_8255_cb,
> dioP2ExpansionIO8Bit);
That 'dioP2ExpansionIO8Bit' line could do with being un-indented by a
couple of spaces so it still lines up with the 'dev' on the preceding line.
--
-=( Ian Abbott @ MEV Ltd. E-mail: <abbotti@mev.co.uk> )=-
-=( Web: http://www.mev.co.uk/ )=-
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Staging: comedi: Simplify a trivial if-return sequence
2015-06-16 13:11 ` Ian Abbott
@ 2015-06-16 14:08 ` Abdul, Hussain (H.)
0 siblings, 0 replies; 3+ messages in thread
From: Abdul, Hussain (H.) @ 2015-06-16 14:08 UTC (permalink / raw)
To: Ian Abbott, gregkh@linuxfoundation.org
Cc: hsweeten@visionengravers.com, devel@driverdev.osuosl.org,
linux-kernel@vger.kernel.org, Ravindran, Madhusudhanan (M.),
Dighe, Niranjan (N.)
On Tuesday 16 June 2015 06:42 PM, Ian Abbott wrote:
> On 16/06/15 08:58, Abdul, Hussain (H.) wrote:
>> From: Abdul Hussain <habdul@visteon.com>
>>
>> This patch simplify a trivial if-return sequence. Possibly combine with
>> a preceding function call.
>>
>> Signed-off-by: Abdul Hussain <habdul@visteon.com>
>> ---
>> drivers/staging/comedi/drivers/dac02.c | 6 +-----
>> drivers/staging/comedi/drivers/daqboard2000.c | 6 +-----
>> drivers/staging/comedi/drivers/dmm32at.c | 6 +-----
>> drivers/staging/comedi/drivers/fl512.c | 6 +-----
>> drivers/staging/comedi/drivers/ni_daq_dio24.c | 6 +-----
>> drivers/staging/comedi/drivers/s626.c | 6 +-----
>> 6 files changed, 6 insertions(+), 30 deletions(-)
>>
> Ideally, this should be split into separate patches.
>
> [snip]
>> diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
>> index 611b0a3..0fe40c2 100644
>> --- a/drivers/staging/comedi/drivers/daqboard2000.c
>> +++ b/drivers/staging/comedi/drivers/daqboard2000.c
>> @@ -713,12 +713,8 @@ static int daqboard2000_auto_attach(struct comedi_device *dev,
>> return result;
>>
>> s = &dev->subdevices[2];
>> - result = subdev_8255_init(dev, s, daqboard2000_8255_cb,
>> + return subdev_8255_init(dev, s, daqboard2000_8255_cb,
>> dioP2ExpansionIO8Bit);
> That 'dioP2ExpansionIO8Bit' line could do with being un-indented by a
> couple of spaces so it still lines up with the 'dev' on the preceding line.
>
Ian,
Split and sent as separate patches with the above change.
Thanks,
Abdul
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-06-16 14:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-16 7:58 [PATCH] Staging: comedi: Simplify a trivial if-return sequence Abdul, Hussain (H.)
2015-06-16 13:11 ` Ian Abbott
2015-06-16 14:08 ` Abdul, Hussain (H.)
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.