From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S941814AbdAGUFI (ORCPT ); Sat, 7 Jan 2017 15:05:08 -0500 Received: from mout.web.de ([212.227.15.4]:63931 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754522AbdAGUE6 (ORCPT ); Sat, 7 Jan 2017 15:04:58 -0500 Subject: [PATCH 9/9] memstick: Delete an unnecessary check in msb_update_block() To: Maxim Levitsky , kernel-janitors@vger.kernel.org References: <64dfa775-4e4a-bdb0-7b55-41f43ccdf11a@users.sourceforge.net> Cc: LKML From: SF Markus Elfring Message-ID: <44ade3ec-9c63-d08b-4544-b0a48ac13594@users.sourceforge.net> Date: Sat, 7 Jan 2017 21:04:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <64dfa775-4e4a-bdb0-7b55-41f43ccdf11a@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:OKYTknBl/uRvZp7V0pksb9jp5MX0vHik8MfJ/5Lm09ByW9iNaMV PAQw/2E4FBEMoFBqP9xM35CUBpPeFnNXoOaedgaZlbPWhPUy7ELGyFGP0KKf2/0wBRS2JV/ 0rDALuSKsFLoD7v4lOBIoF0jlW/+FyNL1fuQybhTFNpjr3NweO92dOL8UZGq4Iy4fysIRAt jZmca8S0D71F3idfVL1rw== X-UI-Out-Filterresults: notjunk:1;V01:K0:zETFd04OsEU=:Zt1O/XEtj4OMxjjrpquScM C48bQXqYvoAQeKHBEbZCBO8plVTpYGsjj0o+vOej5yOnd15TS339K+pd6t0b6S8htig/rRLzO ROyO9aAZvVlbL05A1mdmuZ4D+MMon2sD/QV3tr0pbUkTsJJ6w1BipawDidq/cyWgX5pHM/eLr hUNqbO85m4cd2oJJHIgSZgOzClu1NbAemFViD06FobOTm965T50c7mvAzun82RXoJb6VS7WxU ayn2fJYPrHXDG6cEKDUeHmkHEsFyoM3iYSstxCH4dtVfgCbB8r7mTv5yA/bDhsxmwSx1KcFs0 0a4694rLRhgUEwiG1cJRS8oCV8z5GgkzL5HK9YhN5rP82sKq8eRgiZCxC7dlNMRMZvrFS4ZNJ 3gwajRtHSAcaA1qtET+I3dfF1ucGZU7+c76sjCXQ7RPjgrFqG4tytow1hm3Mcf5gSluPTz+RM f12TcR4kcHINawbLYeZ0IuRPz3oH8WR5vFZyycyg7li27B4i2gygCDYsJauGZO9L933JffjWP L+zIwH6HBVqXbfoefEWefl3rVZ64qr7waZtKFv9rC6RysYqWGf2J+nJqcu6uezTfyPrgN29fl DOViOpFxQZd1rEADC1HDkcBtkssy4/QRnPUBsGfAhDhZmOGZGzoZrLPvXblulGweli4pZUmhm 88rckNChClW2OC92JGbSnJyZ0w2Kty2fonSK1DNZpzSrxBI/6k8bgsq/UDwgwBYP2sNRvTR0r 68OzFdNo/uU25IDblxdbN2G/2lHJVsW7/Uo2krUZCS3QYvBUJTcU6VCP1OX7N/PLAdYc7wcIz YrB55Sc Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 7 Jan 2017 20:21:02 +0100 Further exception handling will only be performed after an error code was set. Thus remove a redundant check for a local variable at the end. Signed-off-by: Markus Elfring --- drivers/memstick/core/ms_block.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 861f6a76136d..013f317d566b 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c @@ -1154,10 +1154,8 @@ static int msb_update_block(struct msb_data *msb, u16 lba, return 0; } out: - if (error) { - pr_err("block update error after %d tries, switching to r/o mode", try); - msb->read_only = true; - } + pr_err("block update error after %d tries, switching to r/o mode", try); + msb->read_only = true; return error; } -- 2.11.0