From patchwork Mon Apr 24 13:33:32 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: 9696401 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 03153601AE for ; Mon, 24 Apr 2017 13:35:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E768126247 for ; Mon, 24 Apr 2017 13:35:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC42B2818B; Mon, 24 Apr 2017 13:35:31 +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=ham 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 6D33826247 for ; Mon, 24 Apr 2017 13:35:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1171564AbdDXNfa (ORCPT ); Mon, 24 Apr 2017 09:35:30 -0400 Received: from mail-lf0-f65.google.com ([209.85.215.65]:34855 "EHLO mail-lf0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1171467AbdDXNdr (ORCPT ); Mon, 24 Apr 2017 09:33:47 -0400 Received: by mail-lf0-f65.google.com with SMTP id i3so16575980lfh.2 for ; Mon, 24 Apr 2017 06:33:46 -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=M3BQ0O7XhWJceg1Gokt9etS20ujTh6RqDnPgIemK30Y=; b=O6K5HGFSeDBtg8R9a6pVUdEiBx7pwecdnVEvgG2+uE16E+QlJ7stUfSMXiDDdCsY1c OHqoRJ/QMxbMobQwNyOkn8dKD5u4OMougpMPhLx5FW7fPP0E/0TB8jeqJPEGYQxUimf8 /foSBBFnQ4tTUYq8fELt1rxTnNMyDJJXac/5s= 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=M3BQ0O7XhWJceg1Gokt9etS20ujTh6RqDnPgIemK30Y=; b=cW4hGBC1MCz/4FuyJrjjXDHcK/p3avGFC6g1InO791A/c6XUZ1Spoj3BGASNL4AclY QarnmObfIBPyCQZOQiWyV91Pph8leNTMqNLsAkSFpGKDmkHzwuyazDLI60x4GTJ2HRYD 0mj4kAMwhzoZmTNIcBEFnW31Fi65bVkqheaQmEuw58Y1PGBxJa3S6LUpKuLqSlPjW19b z+fcOv2weGuJdxoeNCaUvK8NXaalLrtsZlo4XfCKsLXIn3Myl4CifPk/+Vfp6DYxGNxU Cnqo+t/JpXNpCinduF0UN75brS18kZ/xdiO9g1AC5klTKwSwFvx78e7xZL88IlM0zC+7 ECyQ== X-Gm-Message-State: AN3rC/4OXW/T7W5qvGz4qNMb3JXtffKvWOi+DSJLBUv6sQ6Hlh8v615A vROpvnaEYA3GHcuj X-Received: by 10.46.5.82 with SMTP id 79mr8396740ljf.46.1493040824943; Mon, 24 Apr 2017 06:33:44 -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.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 06:33:44 -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 08/10] platform/x86: fujitsu-laptop: allocate struct fujitsu_laptop in acpi_fujitsu_laptop_add() Date: Mon, 24 Apr 2017 15:33:32 +0200 Message-Id: <20170424133334.7064-9-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_laptop when the FUJ02E3 ACPI device is present. Use devm_kzalloc() for allocating memory to simplify cleanup. Until all remaining module 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 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index fb46652250c7..f26abc41266e 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -808,6 +808,7 @@ static int acpi_fujitsu_laptop_leds_register(struct acpi_device *device) static int acpi_fujitsu_laptop_add(struct acpi_device *device) { + struct fujitsu_laptop *priv; int state = 0; int error; int i; @@ -815,11 +816,16 @@ static int acpi_fujitsu_laptop_add(struct acpi_device *device) if (!device) return -EINVAL; + priv = devm_kzalloc(&device->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + fujitsu_laptop = priv; fujitsu_laptop->handle = device->handle; sprintf(acpi_device_name(device), "%s", ACPI_FUJITSU_LAPTOP_DEVICE_NAME); sprintf(acpi_device_class(device), "%s", ACPI_FUJITSU_CLASS); - device->driver_data = fujitsu_laptop; + device->driver_data = priv; /* kfifo */ spin_lock_init(&fujitsu_laptop->fifo_lock); @@ -1039,22 +1045,14 @@ static int __init fujitsu_init(void) /* Register laptop driver */ - fujitsu_laptop = kzalloc(sizeof(struct fujitsu_laptop), GFP_KERNEL); - if (!fujitsu_laptop) { - ret = -ENOMEM; - goto err_unregister_platform_driver; - } - ret = acpi_bus_register_driver(&acpi_fujitsu_laptop_driver); if (ret) - goto err_free_fujitsu_laptop; + goto err_unregister_platform_driver; pr_info("driver " FUJITSU_DRIVER_VERSION " successfully loaded\n"); return 0; -err_free_fujitsu_laptop: - kfree(fujitsu_laptop); err_unregister_platform_driver: platform_driver_unregister(&fujitsu_pf_driver); err_unregister_acpi: @@ -1067,8 +1065,6 @@ static void __exit fujitsu_cleanup(void) { acpi_bus_unregister_driver(&acpi_fujitsu_laptop_driver); - kfree(fujitsu_laptop); - platform_driver_unregister(&fujitsu_pf_driver); acpi_bus_unregister_driver(&acpi_fujitsu_bl_driver);