Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964984AbbHDODv (ORCPT ); Tue, 4 Aug 2015 10:03:51 -0400 Received: from mail-am1on0140.outbound.protection.outlook.com ([157.56.112.140]:58692 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964906AbbHDODt convert rfc822-to-8bit (ORCPT ); Tue, 4 Aug 2015 10:03:49 -0400 From: "Karajgaonkar, Saurabh (S.)" To: "srinivas.kandagatla@gmail.com" , "maxime.coquelin@st.com" , "patrice.chotard@st.com" , "stern@rowland.harvard.edu" , "gregkh@linuxfoundation.org" , "mathias.nyman@intel.com" , "balbi@ti.com" , "johan@kernel.org" , "sergei.shtylyov@cogentembedded.com" , "Julia.Lawall@lip6.fr" , "khilman@linaro.org" , "rafael.j.wysocki@intel.com" , "pmladek@suse.cz" , "wsa@the-dreams.de" CC: "linux-arm-kernel@lists.infradead.org" , "kernel@stlinux.com" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [PATCH v2 6/9] usb: host: u132-hcd: Simplify return statement Thread-Topic: [PATCH v2 6/9] usb: host: u132-hcd: Simplify return statement Thread-Index: AQHQzr5gSTfeuGtApkuuyTjfJTxSKg== Date: Tue, 4 Aug 2015 14:03:45 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=skarajga@visteon.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [74.112.167.117] x-microsoft-exchange-diagnostics: 1;DBXPR06MB381;5:5bkjtnRtHYl+QOFw6bCA6IpkXULYG2uh3fxwkkQEWw6LKGro7rFxE3Nd2CbUlyfG42lDlrGWX3C0teSTiaoJz7B5sgq/jyQugPLeu2GwxemzVQkeUPH3nfMz6e1Bl4c9QEon5K+q8DBmKPVehxWasA==;24:Ubw4JBdcqk5kVes20TpmF9oFIWkSXwVYE//+cuipEZRcqmD6I9X6alnx64dLp1wxdmXcOqQ9D73EFaGxf+eBn4ufpOepGjhuwUBPQPxye7A=;20:9u73Z+bCgZEOXaur1Dz2Ql4nvEdrgMDo7AWBwypJs1N4tjKqRBPRi3jZ65PEsiNq/kje64WwT1jFygrJm5auFQ== x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DBXPR06MB381; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:; x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(601004)(5005006)(3002001);SRVR:DBXPR06MB381;BCL:0;PCL:0;RULEID:;SRVR:DBXPR06MB381; x-forefront-prvs: 0658BAF71F x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(6009001)(189002)(199003)(77156002)(106356001)(118296001)(229853001)(101416001)(33646002)(106116001)(19580395003)(46102003)(2656002)(62966003)(87936001)(86362001)(2201001)(2171001)(122556002)(54356999)(66066001)(36756003)(5001770100001)(2900100001)(5002640100001)(5001860100001)(2950100001)(40100003)(105586002)(77096005)(5001920100001)(76176999)(189998001)(102836002)(2501003)(5001830100001)(64706001)(19580405001)(92566002)(4001540100001)(68736005)(50986999)(81156007)(97736004)(5001960100002)(921003)(1121003);DIR:OUT;SFP:1102;SCL:1;SRVR:DBXPR06MB381;H:DBXPR06MB382.eurprd06.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; spamdiagnosticoutput: 1:23 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 X-OriginatorOrg: visteon.com X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Aug 2015 14:03:45.8423 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7a147aaf-01ec-498c-80a1-e34a8c63c548 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBXPR06MB381 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2795 Lines: 90 From: Saurabh Karajgaonkar Replace redundant variable use in return statement. Signed-off-by: Saurabh Karajgaonkar --- drivers/usb/host/u132-hcd.c | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/drivers/usb/host/u132-hcd.c b/drivers/usb/host/u132-hcd.c index d516877..a67bd50 100644 --- a/drivers/usb/host/u132-hcd.c +++ b/drivers/usb/host/u132-hcd.c @@ -1542,11 +1542,8 @@ static int u132_periodic_reinit(struct u132 *u132) (fit ^ FIT) | u132->hc_fminterval); if (retval) return retval; - retval = u132_write_pcimem(u132, periodicstart, - ((9 * fi) / 10) & 0x3fff); - if (retval) - return retval; - return 0; + return u132_write_pcimem(u132, periodicstart, + ((9 * fi) / 10) & 0x3fff); } static char *hcfs2string(int state) @@ -2701,28 +2698,18 @@ static int u132_roothub_setportfeature(struct u132 *u132, u16 wValue, if (wIndex == 0 || wIndex > u132->num_ports) { return -EINVAL; } else { - int retval; int port_index = wIndex - 1; struct u132_port *port = &u132->port[port_index]; port->Status &= ~(1 << wValue); switch (wValue) { case USB_PORT_FEAT_SUSPEND: - retval = u132_write_pcimem(u132, - roothub.portstatus[port_index], RH_PS_PSS); - if (retval) - return retval; - return 0; + return u132_write_pcimem(u132, + roothub.portstatus[port_index], RH_PS_PSS); case USB_PORT_FEAT_POWER: - retval = u132_write_pcimem(u132, - roothub.portstatus[port_index], RH_PS_PPS); - if (retval) - return retval; - return 0; + return u132_write_pcimem(u132, + roothub.portstatus[port_index], RH_PS_PPS); case USB_PORT_FEAT_RESET: - retval = u132_roothub_portreset(u132, port_index); - if (retval) - return retval; - return 0; + return u132_roothub_portreset(u132, port_index); default: return -EPIPE; } @@ -2737,7 +2724,6 @@ static int u132_roothub_clearportfeature(struct u132 *u132, u16 wValue, } else { int port_index = wIndex - 1; u32 temp; - int retval; struct u132_port *port = &u132->port[port_index]; port->Status &= ~(1 << wValue); switch (wValue) { @@ -2773,11 +2759,8 @@ static int u132_roothub_clearportfeature(struct u132 *u132, u16 wValue, default: return -EPIPE; } - retval = u132_write_pcimem(u132, roothub.portstatus[port_index], - temp); - if (retval) - return retval; - return 0; + return u132_write_pcimem(u132, roothub.portstatus[port_index], + temp); } } -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/