From patchwork Mon Apr 24 13:33:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TWljaGHFgiBLxJlwaWXFhA==?= X-Patchwork-Id: 9696393 X-Patchwork-Delegate: dvhart@infradead.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 29244601AE for ; Mon, 24 Apr 2017 13:35:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1782927FAD for ; Mon, 24 Apr 2017 13:35:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0971228307; Mon, 24 Apr 2017 13:35:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 93D6627FAD for ; Mon, 24 Apr 2017 13:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1170970AbdDXNeB (ORCPT ); Mon, 24 Apr 2017 09:34:01 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34629 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1171318AbdDXNdo (ORCPT ); Mon, 24 Apr 2017 09:33:44 -0400 Received: by mail-lf0-f65.google.com with SMTP id x72so16554044lfb.1 for ; Mon, 24 Apr 2017 06:33:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kempniu.pl; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2t1dLbrdW1Xr1TcsNO3k0Sv1k4JhHs7rfSkrALyGop0=; b=R2r0orc/v1BWd/yfkgiBODlWjQ69mSP8bZVZMyjop5vKCpDlZXls0IjMhwMycocYZ8 P7ZoMKrIUgrt84t9yprXVQTHDO/imL86VsUhupoQl+B0FcO16uYdNL08LGKOSKU6owSO AMOEAlwsoH5SnP+OEp9bXG1CDNj7Gt61I06CE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2t1dLbrdW1Xr1TcsNO3k0Sv1k4JhHs7rfSkrALyGop0=; b=lM4djoS5+GzjjZCwbMfZuCnQaDiEw6M0PcHsafTZQ/QCdHgnpeL4LsC4tlu7mZrq/z RXF2LXVn7173xeIvWqH3p1y1e3Yvnc2/iYTHg0vqOV30nkWWlU2wqCO+3hyVsqFFPF7p 2QqLnGM/bXDx0zs/lRmUOOT7Cr0KpiYVdIkys1P7XRi4kSqxGWNoJdHQhMBzzbTU43R2 Y9OUeU/FriE2tEvhsMuwhiXz42OC9UToVnpT4mxrVzymFvQvhgfYeYOHBdLLVroGoikn j2MmLmAd/b119L39TBh942zI7HTbuTO7pLR4o2booXgcyunZ94MTgBMN4m+OGEp3wNXv urnQ== X-Gm-Message-State: AN3rC/7rg4q21JWniRazmFGHot6I7EIJwSVkOnHKwqWl129perJd9fXa CY8NqXlP3Mnhig== X-Received: by 10.46.71.212 with SMTP id u203mr8183803lja.99.1493040823145; Mon, 24 Apr 2017 06:33:43 -0700 (PDT) Received: from ozzy.hq.kempniu.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id 69sm3346138lfq.36.2017.04.24.06.33.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 06:33:42 -0700 (PDT) From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= To: Jonathan Woithe , Darren Hart , Andy Shevchenko Cc: platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] platform/x86: fujitsu-laptop: allocate struct fujitsu_bl in acpi_fujitsu_bl_add() Date: Mon, 24 Apr 2017 15:33:30 +0200 Message-Id: <20170424133334.7064-7-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170424133334.7064-1-kernel@kempniu.pl> References: <20170424133334.7064-1-kernel@kempniu.pl> 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-Virus-Scanned: ClamAV using ClamSMTP Only allocate memory for struct fujitsu_bl when the FUJ02B1 ACPI device is present. Use devm_kzalloc() for allocating memory to simplify cleanup. Until all backlight-related code is modified to only use device-specific data, the pointer to the allocated memory still has to be stored in a module-wide variable. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index 536b601c7067..780e11b43d27 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -417,6 +417,7 @@ static int fujitsu_backlight_register(struct acpi_device *device) static int acpi_fujitsu_bl_add(struct acpi_device *device) { + struct fujitsu_bl *priv; int state = 0; int error; @@ -426,10 +427,15 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device) if (!device) return -EINVAL; + priv = devm_kzalloc(&device->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + fujitsu_bl = priv; fujitsu_bl->handle = device->handle; sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_BL_DEVICE_NAME); sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS); - device->driver_data = fujitsu_bl; + device->driver_data = priv; error = acpi_fujitsu_bl_input_setup(device); if (error) @@ -1018,13 +1024,9 @@ static int __init fujitsu_init(void) if (acpi_disabled) return -ENODEV; - fujitsu_bl = kzalloc(sizeof(struct fujitsu_bl), GFP_KERNEL); - if (!fujitsu_bl) - return -ENOMEM; - ret = acpi_bus_register_driver(&acpi_fujitsu_bl_driver); if (ret) - goto err_free_fujitsu_bl; + return ret; /* Register platform stuff */ @@ -1054,8 +1056,6 @@ static int __init fujitsu_init(void) platform_driver_unregister(&fujitsu_pf_driver); err_unregister_acpi: acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver); -err_free_fujitsu_bl: - kfree(fujitsu_bl); return ret; } @@ -1070,8 +1070,6 @@ static void __exit fujitsu_cleanup(void) acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver); - kfree(fujitsu_bl); - pr_info("driver unloaded\n"); }