From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751986AbcACKDH (ORCPT ); Sun, 3 Jan 2016 05:03:07 -0500 Received: from mout.web.de ([212.227.17.12]:52629 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751329AbcACKDE (ORCPT ); Sun, 3 Jan 2016 05:03:04 -0500 Subject: [PATCH 2/2] 390/qeth: Refactoring for qeth_core_set_online() To: linux-s390@vger.kernel.org, Heiko Carstens , Martin Schwidefsky , Ursula Braun References: <566ABCD9.1060404@users.sourceforge.net> <5688F13A.70601@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <5688F1D0.3090502@users.sourceforge.net> Date: Sun, 3 Jan 2016 11:02:56 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <5688F13A.70601@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:4fA1yaj+i68RwmAsV9kJuhaTG8A/duPN6atl2PVkGa79QWHE+wG xpMFAWQcdr1a6rPjC1aZ4aTelqC2S4eFpOEJI+vXOD1jioaOcyYY9OerE6s8/3dRaY91I+1 JF5ccmcBzC0OsRLdqESpiF4fznv7KoNckBB0lCezVHcTHWCMQ6U7DDYoQhDHpdEWQrtTtfo L70ErMBDbnodphA0Z9+VQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:HL7tpx6dIJs=:zVZ9GIpXVJJmUcHxduullX EWi1ZsEI5Y7Qasefi8irlHB59gY8XMsFBC+elzHhV8usD3ZJs/W+fOLW6xkMCVZw6QmY2Fh4h sZLwQff+RcYl/gf82kYzjvevmUScHcT2vpb7SRy4rqZ9IsM3y2Hp2TQ1vI6wW33+E6kULCuQ5 RF+DfN/YnQVoP2wNVI4ESD8JKYDIPE2yj+XObF2X8ACT74SIk3DEYC9cemXKwbiVxBVKkmZ90 s9JTGPOEoCi7lIoOiM/tfjHM9p+r1zNWC9VtN7NaQVmwFxuXBpF8ZjxHYhIIiqTBQ/V3Jz+X9 cX4ZP+CgbkdcrTsloFiVzeyZ+ljnRnL+pONshjAzjKNv41Hv5/J4coZj5IRnYLAYA7j1Xqo5w qo63vyl1blzLCcrz0fzsstK5d2BhMgJmEBPzrdCebfbevFCy6aKFqrmMlz0G+aOBcTGjfLTIg j3PCu8UFT3dITqp2PyPRuiv9HsiqRUo1tZ5/B9EYTfUxdAAQMUSlFo5z41LlttOnL2ivvnJiH vffMgwQ7IluiZTWh2nH7pbl4PFecwKgHlxvo237Mol3mxAjFMPfkz1LQpqVSHSw+3zAe51cMH Uz3B8I6of5mQEHAtVKXUvJB08vVo8iB0ncvuuHMoBaZhcZWJG/ozpS2DbiwYHFaW//RtIBnDl 9JEeBfg93HfFzRO81LtGzw3A5bPz/1ecHGnp5o3SKSuhY0UL6bZDPmw0QUI99n5+96GRFIZ9P KKRQEU+0msrXI5PJdM98CwOKAdCMrWB6ZUu+YL2uCWs260W8uu4ozh0ImjR7by81b3HeQWudn 7qru1Vs Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 3 Jan 2016 10:50:11 +0100 Reduce the scope for the local variable "def_discipline" to one branch of an if statement. Signed-off-by: Markus Elfring --- drivers/s390/net/qeth_core_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 54fde2e..3261977 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -5638,9 +5638,10 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev) { struct qeth_card *card = dev_get_drvdata(&gdev->dev); int rc; - int def_discipline; if (!card->discipline) { + int def_discipline; + if (card->info.type == QETH_CARD_TYPE_IQD) def_discipline = QETH_DISCIPLINE_LAYER3; else -- 2.6.3 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sun, 03 Jan 2016 10:02:56 +0000 Subject: [PATCH 2/2] 390/qeth: Refactoring for qeth_core_set_online() Message-Id: <5688F1D0.3090502@users.sourceforge.net> List-Id: References: <566ABCD9.1060404@users.sourceforge.net> <5688F13A.70601@users.sourceforge.net> In-Reply-To: <5688F13A.70601@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-s390@vger.kernel.org, Heiko Carstens , Martin Schwidefsky , Ursula Braun Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: Markus Elfring Date: Sun, 3 Jan 2016 10:50:11 +0100 Reduce the scope for the local variable "def_discipline" to one branch of an if statement. Signed-off-by: Markus Elfring --- drivers/s390/net/qeth_core_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 54fde2e..3261977 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c @@ -5638,9 +5638,10 @@ static int qeth_core_set_online(struct ccwgroup_device *gdev) { struct qeth_card *card = dev_get_drvdata(&gdev->dev); int rc; - int def_discipline; if (!card->discipline) { + int def_discipline; + if (card->info.type = QETH_CARD_TYPE_IQD) def_discipline = QETH_DISCIPLINE_LAYER3; else -- 2.6.3