From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751640AbbHEHFd (ORCPT ); Wed, 5 Aug 2015 03:05:33 -0400 Received: from e06smtp10.uk.ibm.com ([195.75.94.106]:56423 "EHLO e06smtp10.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750738AbbHEHFb (ORCPT ); Wed, 5 Aug 2015 03:05:31 -0400 X-Helo: d06dlp03.portsmouth.uk.ibm.com X-MailFrom: heiko.carstens@de.ibm.com X-RcptTo: linux-s390@vger.kernel.org Date: Wed, 5 Aug 2015 09:05:18 +0200 From: Heiko Carstens To: Peter Senna Tschudin Cc: wein@de.ibm.com, stefan.haberland@de.ibm.com, schwidefsky@de.ibm.com, linux390@de.ibm.com, maier@linux.vnet.ibm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2] s390: Remove unneeded variables Message-ID: <20150805070518.GB4163@osiris> References: <1438701107-30727-1-git-send-email-peter.senna@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1438701107-30727-1-git-send-email-peter.senna@gmail.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15080507-0041-0000-0000-000005279C3D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Aug 04, 2015 at 05:11:47PM +0200, Peter Senna Tschudin wrote: > This patch remove unneeded variables used to store return values. > > These issues were detected with the Coccinelle script: > scripts/coccinelle/misc/returnvar.cocci > > Signed-off-by: Peter Senna Tschudin > --- > static struct css_device_id eadm_subchannel_ids[] = { > diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c > index 2e65b98..a79d698 100644 > --- a/drivers/s390/net/qeth_l2_main.c > +++ b/drivers/s390/net/qeth_l2_main.c > @@ -392,8 +392,6 @@ static int qeth_l2_vlan_rx_kill_vid(struct net_device *dev, > > static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode) > { > - int rc = 0; > - > QETH_DBF_TEXT(SETUP , 2, "stopcard"); > QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); > > @@ -427,7 +425,8 @@ static int qeth_l2_stop_card(struct qeth_card *card, int recovery_mode) > qeth_clear_cmd_buffers(&card->read); > qeth_clear_cmd_buffers(&card->write); > } > - return rc; > + > + return 0; > } > > static int qeth_l2_process_inbound_buffer(struct qeth_card *card, > diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c > index 70eb2f6..ee5e2ac 100644 > --- a/drivers/s390/net/qeth_l3_main.c > +++ b/drivers/s390/net/qeth_l3_main.c > @@ -2160,8 +2160,6 @@ static struct qeth_card *qeth_l3_get_card_from_dev(struct net_device *dev) > > static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode) > { > - int rc = 0; > - > QETH_DBF_TEXT(SETUP, 2, "stopcard"); > QETH_DBF_HEX(SETUP, 2, &card, sizeof(void *)); > > @@ -2196,7 +2194,8 @@ static int qeth_l3_stop_card(struct qeth_card *card, int recovery_mode) > qeth_clear_cmd_buffers(&card->read); > qeth_clear_cmd_buffers(&card->write); > } > - return rc; > + > + return 0; Applied. However I changed your patch a bit and made the *_stop_card() functions return void instead, since the calling functions didn't care anyway. Thanks!