Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

[PATCH] Staging: comedi: remove unnecessary braces in pcl711.c

3 views
Skip to first unread message

Chase Southwood

unread,
Jan 13, 2014, 10:20:01 PM1/13/14
to
This patch for pcl711.c removes braces causing a checkpatch.pl warning.
It also removes an empty else arm of an if-else statement.

Signed-off-by: Chase Southwood <chase.s...@yahoo.com>
---

I removed the "else" arm of this statement because it was empty, save for the "ignore" comment. If it is instead preferred kernel style for this empty else to remain in, let me know and I will correct this patch accordingly.

drivers/staging/comedi/drivers/pcl711.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
index f0fc123..6595788 100644
--- a/drivers/staging/comedi/drivers/pcl711.c
+++ b/drivers/staging/comedi/drivers/pcl711.c
@@ -336,11 +336,8 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);

- if (cmd->stop_src == TRIG_NONE) {
+ if (cmd->stop_src == TRIG_NONE)
err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
- } else {
- /* ignore */
- }

if (err)
return 3;
--
1.8.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Dan Carpenter

unread,
Jan 14, 2014, 2:20:02 AM1/14/14
to
On Mon, Jan 13, 2014 at 09:13:16PM -0600, Chase Southwood wrote:
> This patch for pcl711.c removes braces causing a checkpatch.pl warning.
> It also removes an empty else arm of an if-else statement.
>
> Signed-off-by: Chase Southwood <chase.s...@yahoo.com>
> ---
>
> I removed the "else" arm of this statement because it was empty, save
> for the "ignore" comment. If it is instead preferred kernel style for
> this empty else to remain in, let me know and I will correct this
> patch accordingly.
>

Nope, it's perfect. Don't doubt yourself. Always feel free to change
the code.

regards,
dan carpenter

Ian Abbott

unread,
Jan 14, 2014, 7:00:02 AM1/14/14
to
On 2014-01-14 03:13, Chase Southwood wrote:
> This patch for pcl711.c removes braces causing a checkpatch.pl warning.
> It also removes an empty else arm of an if-else statement.
>
> Signed-off-by: Chase Southwood <chase.s...@yahoo.com>
> ---
>
> I removed the "else" arm of this statement because it was empty, save for the "ignore" comment. If it is instead preferred kernel style for this empty else to remain in, let me know and I will correct this patch accordingly.
>
> drivers/staging/comedi/drivers/pcl711.c | 5 +----
> 1 file changed, 1 insertion(+), 4 deletions(-)
>
> diff --git a/drivers/staging/comedi/drivers/pcl711.c b/drivers/staging/comedi/drivers/pcl711.c
> index f0fc123..6595788 100644
> --- a/drivers/staging/comedi/drivers/pcl711.c
> +++ b/drivers/staging/comedi/drivers/pcl711.c
> @@ -336,11 +336,8 @@ static int pcl711_ai_cmdtest(struct comedi_device *dev,
> err |= cfc_check_trigger_arg_is(&cmd->convert_arg, 0);
> err |= cfc_check_trigger_arg_is(&cmd->scan_end_arg, cmd->chanlist_len);
>
> - if (cmd->stop_src == TRIG_NONE) {
> + if (cmd->stop_src == TRIG_NONE)
> err |= cfc_check_trigger_arg_is(&cmd->stop_arg, 0);
> - } else {
> - /* ignore */
> - }
>
> if (err)
> return 3;
>

Not sure if it's worth me reviewing these minor clean-up patches or not,
but FWIW I approve of this patch.

Reviewed-by: Ian Abbott <abb...@mev.co.uk>

--
-=( Ian Abbott @ MEV Ltd. E-mail: <abb...@mev.co.uk> )=-
-=( Tel: +44 (0)161 477 1898 FAX: +44 (0)161 718 3587 )=-
0 new messages