From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932220AbdJ3NLn (ORCPT ); Mon, 30 Oct 2017 09:11:43 -0400 Received: from mout.web.de ([212.227.17.11]:63641 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751917AbdJ3NLj (ORCPT ); Mon, 30 Oct 2017 09:11:39 -0400 To: linux-pcmcia@lists.infradead.org Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Subject: [PATCH] pcmcia/vrc4171: Use common error handling code in vrc4171_card_init() Message-ID: Date: Mon, 30 Oct 2017 14:11:01 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:AsKkvFaSUpLGJKdVhhtcu2N0UYNYlQzRhnOvwxMBXlWyUKRqErd G4tlm/vDZ+pfOZ6YxTYhQ0yHtuRzZqr8x8/PWbBx86vdznAA3Fr815jnOfVgkKlKxlHtqY8 6G5XYgl6jlPEoePkk9ySnNCYo7Kfwz0C4SZvQXyQ/c3xUG5GgNdA4zV7bsuFvQVkXw95tQS 80cycwSQoipi/4DsZJe0w== X-UI-Out-Filterresults: notjunk:1;V01:K0:F7KGWtOphsc=:DkAjpZmiJBrjNK+42qICZq X41YY51kCjrvIbDcQRecHXUiGCRzDnkGlRrn4pSSZ/FyVKM+8x8moZVfcp+st44WtPdIVLEDk AgblbmKOSQpjV5xvmIfxIxwLe6J3t2KdlsqjTjUcweUqCJ4lJ7qdcgY6r/ZRc6qwC2gyMb0or inX/EXKsaIV8xJHr6NnNOQqKkQU0cvyymSajwSYh6Qx0RT7HELZuvsbimPOmtWSSWC7vkQtjM UHy0EQ+v8M/bK7E/srTDvCvv7FuoiD6Wmdf+HBXOK3oV8FASRmtkv6U4m19xdrJdzYE8xBOSR ElsfhOORKSJzJ1IgO+Jwr+hPDpA/F/deIbg4GO6EDy0ZvKye06OZoV7M5gQ+O6N3x0Dh//SPX kr2IoHUI/W/sE1az08AGmfEzfd3UJIhiR3DmGhixabUk1O9toSmZqViV0QvoQloBg18qBStnm GZCHkZXGafiHluGE9X+cDe6C3lDreGB54m+MtwL+7+spENH99VwNZ3qfH6uiFneRejZXHd49F gLQv+BLCWkz8FrOkN6sAkZHiEsco6FbDfc4s9rmpxuuAP57c07zG/Yh4dmKCPSLZ30Rf4+NRu 05R4lyvFq9foHTpjjGsMs7ZCUtJF4ywEnHftoZ/Mzck5pkxNmcam2OsnflpItyXBASGAos8KR HcghyThbhoQ0D7zNG+q1jTPyEafHIksHsTrv1Lw2dORJUBX0LbcuUDKWgc2CjdvxsfkUPXlzF QjFKUfvSc1godVcL3VbvksErkJEewzTnS6QSH5MsIb4YhQb43mfkwL1Xr2MQ/sL+DB9ykoaxH DjI5gkuADllA2rRg7M7ca0hlTqTgI1zEMFxsIBzcv7va7Mnk5s= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 30 Oct 2017 14:05:35 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/pcmcia/vrc4171_card.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/pcmcia/vrc4171_card.c b/drivers/pcmcia/vrc4171_card.c index 1e5fa211fb70..56d39585ac9a 100644 --- a/drivers/pcmcia/vrc4171_card.c +++ b/drivers/pcmcia/vrc4171_card.c @@ -721,10 +721,8 @@ static int vrc4171_card_init(void) return retval; retval = platform_device_register(&vrc4171_card_device); - if (retval < 0) { - platform_driver_unregister(&vrc4171_card_driver); - return retval; - } + if (retval < 0) + goto unregister_driver; vrc4171_set_multifunction_pin(vrc4171_slotb); @@ -736,14 +734,17 @@ static int vrc4171_card_init(void) if (retval < 0) { vrc4171_remove_sockets(); platform_device_unregister(&vrc4171_card_device); - platform_driver_unregister(&vrc4171_card_driver); - return retval; + goto unregister_driver; } printk(KERN_INFO "%s, connected to IRQ %d\n", vrc4171_card_driver.driver.name, vrc4171_irq); return 0; + +unregister_driver: + platform_driver_unregister(&vrc4171_card_driver); + return retval; } static void vrc4171_card_exit(void) -- 2.14.3