From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756126AbbFPH6I (ORCPT ); Tue, 16 Jun 2015 03:58:08 -0400 Received: from mail-am1on0105.outbound.protection.outlook.com ([157.56.112.105]:8208 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752563AbbFPH6D convert rfc822-to-8bit (ORCPT ); Tue, 16 Jun 2015 03:58:03 -0400 From: "Abdul, Hussain (H.)" 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.)" Subject: [PATCH] Staging: comedi: Simplify a trivial if-return sequence Thread-Topic: [PATCH] Staging: comedi: Simplify a trivial if-return sequence Thread-Index: AQHQqAoqVcs9guwYVku5gHKoMl7Xaw== Date: Tue, 16 Jun 2015 07:58:00 +0000 Message-ID: <1434441401-13894-1-git-send-email-habdul@visteon.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 1.9.1 authentication-results: linuxfoundation.org; dkim=none (message not signed) header.d=none; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [74.112.167.117] x-microsoft-exchange-diagnostics: 1;DB5PR06MB1109;3:txylCdiQ1LnJ512QPdkKkHPoXWAX8CH2eEXMu8BjUwXr3jZNxjjy4Hgviaki8baSWNdw2yQe5m3k5TnIdC1NCfw9yk4WME7Ukl1NpMVlzP8gtPCY4bfejoULiauJzE4ebEbiWMFeaybq8mvGrjKt8g==;10:fnLrWw5OyJKPPXp2snQPUL5P9b8o+Eo4/UwOSKgOOcbcQxt4m7nQqraQ6Dfyu8NB4vMlVa0ORWAg6uZC/oqTuV8GbDxuIRPB6K2Ayp0BMe0=;6:dYH855w1sR29baeyo+5WVLl0lSjWiBC4vbgvrfcqc5k3QIavRUJGkNDqCo8mGL51 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB5PR06MB1109; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(601004)(520003)(5005006)(3002001);SRVR:DB5PR06MB1109;BCL:0;PCL:0;RULEID:;SRVR:DB5PR06MB1109; x-forefront-prvs: 06098A2863 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(46102003)(50986999)(87936001)(2656002)(19580405001)(19580395003)(2900100001)(575784001)(77096005)(86362001)(66066001)(102836002)(50226001)(5890100001)(40100003)(33646002)(110136002)(2501003)(5002640100001)(229853001)(189998001)(77156002)(2351001)(106116001)(107886002)(5001960100002)(122556002)(36756003)(92566002)(4001430100001);DIR:OUT;SFP:1102;SCL:1;SRVR:DB5PR06MB1109;H:DB5PR06MB1112.eurprd06.prod.outlook.com;FPR:;SPF:None;MLV:sfv;LANG:en; Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT MIME-Version: 1.0 X-OriginatorOrg: visteon.com X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Jun 2015 07:58:00.7945 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7a147aaf-01ec-498c-80a1-e34a8c63c548 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR06MB1109 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Abdul Hussain This patch simplify a trivial if-return sequence. Possibly combine with a preceding function call. Signed-off-by: Abdul Hussain --- 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