From patchwork Sun Aug 23 11:41:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giedrius Statkevi?ius X-Patchwork-Id: 7057521 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C63299F305 for ; Sun, 23 Aug 2015 11:42:21 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3A18206E3 for ; Sun, 23 Aug 2015 11:42:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1C336204EA for ; Sun, 23 Aug 2015 11:42:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752116AbbHWLmS (ORCPT ); Sun, 23 Aug 2015 07:42:18 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:33537 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752100AbbHWLmS (ORCPT ); Sun, 23 Aug 2015 07:42:18 -0400 Received: by wijp15 with SMTP id p15so53630292wij.0 for ; Sun, 23 Aug 2015 04:42:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=W+xriy04fMJTjEbvGSW02THrefceaFY8eG4EsilSgnk=; b=H7/Aw8oGV7iHSFNlqwmq/OMFQpTHFcOOX49dsLWE0bFJAhRWb+9dCSEsjrpyONoK1D 4gHS9x8wVYDpSYHE5iCoSotG3VylB4w9YEBKpiLsod39u472GjB4kYnRx2DXFqkYN4OM p+qLks80KhcjHh544jGIeHc6r2doY7a5ZFlAcJ//TlLIHURIJYig8ojzW/j73X0L/Kce BhKSXg4kQN/hXxf77/iUfxlA+2/lDhY7Wt8ae9S0j5Pg4zHpHa3uzLJroeJOuebkbeYl mR8ypx/n37fhDsbaLi6G25frPvsVLP4mE7iRaKoYuNKjhEZi+EycgvRMBAgR0ncJ6dis /XZw== X-Received: by 10.180.81.67 with SMTP id y3mr21428773wix.42.1440330136996; Sun, 23 Aug 2015 04:42:16 -0700 (PDT) Received: from localhost.localdomain (78-57-189-147.static.zebra.lt. [78.57.189.147]) by smtp.gmail.com with ESMTPSA id ev2sm11295732wib.21.2015.08.23.04.42.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 23 Aug 2015 04:42:16 -0700 (PDT) From: =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= To: dvhart@infradead.org Cc: platform-driver-x86@vger.kernel.org, =?UTF-8?q?Giedrius=20Statkevi=C4=8Dius?= Subject: [PATCH] hp-wireless: remove unneeded goto/label in hpwl_init Date: Sun, 23 Aug 2015 14:41:09 +0300 Message-Id: <1440330069-16537-1-git-send-email-giedrius.statkevicius@gmail.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-8.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP acpi_bus_register_driver() already returns an appropriate value (0 on success, and some negative value on error) to be used in __init functions so the goto/label is redundant in hpwl_init thus remove it and directly return the value Signed-off-by: Giedrius Statkevi?ius --- drivers/platform/x86/hp-wireless.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/platform/x86/hp-wireless.c b/drivers/platform/x86/hp-wireless.c index 4e4cc8b..988eedb 100644 --- a/drivers/platform/x86/hp-wireless.c +++ b/drivers/platform/x86/hp-wireless.c @@ -114,14 +114,9 @@ static int __init hpwl_init(void) pr_info("Initializing HPQ6001 module\n"); err = acpi_bus_register_driver(&hpwl_driver); - if (err) { + if (err) pr_err("Unable to register HP wireless control driver.\n"); - goto error_acpi_register; - } - - return 0; -error_acpi_register: return err; }