From patchwork Thu Mar 30 10:35:00 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: 9653721 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 DD47360113 for ; Thu, 30 Mar 2017 10:38:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8E1C2857F for ; Thu, 30 Mar 2017 10:38:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BC29928583; Thu, 30 Mar 2017 10:38:29 +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 A90032857F for ; Thu, 30 Mar 2017 10:38:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932877AbdC3KiQ (ORCPT ); Thu, 30 Mar 2017 06:38:16 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:35481 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933652AbdC3KfW (ORCPT ); Thu, 30 Mar 2017 06:35:22 -0400 Received: by mail-lf0-f67.google.com with SMTP id v2so4166945lfi.2 for ; Thu, 30 Mar 2017 03:35:21 -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=OF4t8Ehl3cEaAkx3y58FXs6eqGaSPhkxk58mbcgdsKQ=; b=f4yNd5xlfQv3+99Z8qZlS9pvpOqRn1mAyXAsvKbgv64HehvmQlHZYwHxvfruAIKMb6 qTnubxtPk1NONa4XqJF8jYRnpWXbB9PQaJtGWh67btU7xJgcLhYneTs7FdforMIb1YU8 6GY2vk8bxJV4s/6m4gcGYZ76vf8T93Z6pMSCo= 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=OF4t8Ehl3cEaAkx3y58FXs6eqGaSPhkxk58mbcgdsKQ=; b=MDDxczT3fxOSHqSML3RdgG61cpeVXil8C1btUXde+cUzDOY8C9vqTu4DFeVhRQIPdp gfDzJ7LnjUUwghgScq7qY4rkxjzi0yqsqhZaF3vqSreWrVfu0ggdOsZ7jbVNNFVGs+m2 Pbsqp7qweX5TDJkOjDtcLbKkbVi1F6eZua0qm5BYxZ6sUcNbIqVnsYbjhR+mEY4zItW5 UJrdWJlDxisIMB0cJPcrWbSU7UFQeCAW85ozKt6v31oMcb+11YhwCgZ2tFbUil/syd+H D55oAxL9uPeFc/slTjxgn8J9kgMXcH3UXKQ4FDRxnU/3S6W8DNnJx8BIjimo6OtI1yKe TP8g== X-Gm-Message-State: AFeK/H2zZXJAtna8Zck2lkiBK58QIBSSSpqEaq5lGFHSDSPwEaHOoTB2xi6bXfK6LlXExQ== X-Received: by 10.25.198.19 with SMTP id w19mr1684976lff.175.1490870115271; Thu, 30 Mar 2017 03:35:15 -0700 (PDT) Received: from ozzy.nask.waw.pl ([2001:a10:160:3::3]) by smtp.googlemail.com with ESMTPSA id x1sm296975lfb.54.2017.03.30.03.35.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Mar 2017 03:35:14 -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 02/11] platform/x86: fujitsu-laptop: switch to a managed backlight device Date: Thu, 30 Mar 2017 12:35:00 +0200 Message-Id: <20170330103509.32509-3-kernel@kempniu.pl> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170330103509.32509-1-kernel@kempniu.pl> References: <20170330103509.32509-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 Use a managed backlight device to get rid of acpi_fujitsu_bl_remove(). Change the parent of the backlight device from NULL to the FUJ02B1 ACPI device as the latter is required for the backlight device to work. Signed-off-by: Michał Kępień --- drivers/platform/x86/fujitsu-laptop.c | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index a428da3b591d..a9520e732c8b 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c @@ -565,17 +565,18 @@ static int acpi_fujitsu_bl_input_setup(struct acpi_device *device) return input_register_device(fujitsu_bl->input); } -static int fujitsu_backlight_register(void) +static int fujitsu_backlight_register(struct acpi_device *device) { - struct backlight_properties props = { + const struct backlight_properties props = { .brightness = fujitsu_bl->brightness_level, .max_brightness = fujitsu_bl->max_brightness - 1, .type = BACKLIGHT_PLATFORM }; struct backlight_device *bd; - bd = backlight_device_register("fujitsu-laptop", NULL, NULL, - &fujitsu_bl_ops, &props); + bd = devm_backlight_device_register(&device->dev, "fujitsu-laptop", + &device->dev, NULL, + &fujitsu_bl_ops, &props); if (IS_ERR(bd)) return PTR_ERR(bd); @@ -644,24 +645,13 @@ static int acpi_fujitsu_bl_add(struct acpi_device *device) fujitsu_bl->max_brightness = FUJITSU_LCD_N_LEVELS; get_lcd_level(); - error = fujitsu_backlight_register(); + error = fujitsu_backlight_register(device); if (error) return error; return 0; } -static int acpi_fujitsu_bl_remove(struct acpi_device *device) -{ - struct fujitsu_bl *fujitsu_bl = acpi_driver_data(device); - - backlight_device_unregister(fujitsu_bl->bl_device); - - fujitsu_bl->acpi_handle = NULL; - - return 0; -} - /* Brightness notify */ static void acpi_fujitsu_bl_notify(struct acpi_device *device, u32 event) @@ -1092,7 +1082,6 @@ static struct acpi_driver acpi_fujitsu_bl_driver = { .ids = fujitsu_bl_device_ids, .ops = { .add = acpi_fujitsu_bl_add, - .remove = acpi_fujitsu_bl_remove, .notify = acpi_fujitsu_bl_notify, }, };