From patchwork Fri May 12 14:02:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Wilczynski X-Patchwork-Id: 681242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 429D1C77B7C for ; Fri, 12 May 2023 14:03:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241436AbjELODo (ORCPT ); Fri, 12 May 2023 10:03:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241426AbjELODY (ORCPT ); Fri, 12 May 2023 10:03:24 -0400 Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CAF161BC8 for ; Fri, 12 May 2023 07:03:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683900203; x=1715436203; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=PkjZ6qDSEVxr3FTGVDws70MoSSjFjJxqrVlvUsZr32w=; b=RR9tH+VLEdOUkPsqB5p9uN7tTYE4V6aLfQHQ0Y5X64s+5fpcCld21ZZx +irFwmavTa6Z4QZ2I9AoExk8SZMNtBn826uHW8Bv2JST+V4B5NYtETh2S guC13d9Y4WiO4IKd0QbFhbeefYhIPGwb8cxyErtu+2ROSEnxe0GOJSgGU ANbyGxdQ+M9m+39gyVocKRA9OqPm4V1QS/NauehGbMH6EUjYxej3kGswo FyvDqukZ4lxesU7q/XRknnmOgBdHY2ITGNs2F5t1kOqnFbWC9ExbQC+mV YBofPHw56ljg3ly2VPjSa7uD6ZU7u3RbS4KolGm336MZGVcCNyfvbz7Rl w==; X-IronPort-AV: E=McAfee;i="6600,9927,10708"; a="378931143" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="378931143" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2023 07:03:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10708"; a="650648990" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="650648990" Received: from hextor.igk.intel.com ([10.123.220.6]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2023 07:03:21 -0700 From: Michal Wilczynski To: linux-acpi@vger.kernel.org Cc: rafael@kernel.org, Michal Wilczynski Subject: [PATCH v1 22/34] platform/x86/lg-laptop: Move handler installing logic to driver Date: Fri, 12 May 2023 16:02:10 +0200 Message-Id: <20230512140222.124868-23-michal.wilczynski@intel.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230512140222.124868-1-michal.wilczynski@intel.com> References: <20230512140222.124868-1-michal.wilczynski@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Currently logic for installing notifications from ACPI devices is implemented using notify callback in struct acpi_driver. Preparations are being made to replace acpi_driver with more generic struct platform_driver, which doesn't contain notify callback. Furthermore as of now handlers are being called indirectly through acpi_notify_device(), which decreases performance. Call acpi_device_install_event_handler() at the end of .add() callback. Call acpi_device_remove_event_handler() at the beginning of .remove() callback. Change arguments passed to the notify callback to match with what's required by acpi_device_install_event_handler(). Signed-off-by: Michal Wilczynski --- drivers/platform/x86/lg-laptop.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/lg-laptop.c b/drivers/platform/x86/lg-laptop.c index ad3c39e9e9f5..79c02df3cb11 100644 --- a/drivers/platform/x86/lg-laptop.c +++ b/drivers/platform/x86/lg-laptop.c @@ -270,8 +270,9 @@ static void wmi_input_setup(void) } } -static void acpi_notify(struct acpi_device *device, u32 event) +static void acpi_notify(acpi_handle handle, u32 event, void *data) { + struct acpi_device *device = data; struct key_entry *key; acpi_handle_debug(device->handle, "notify: %d\n", event); @@ -752,7 +753,11 @@ static int acpi_add(struct acpi_device *device) wmi_input_setup(); battery_hook_register(&battery_hook); - return 0; + ret = acpi_device_install_event_handler(device, ACPI_DEVICE_NOTIFY, acpi_notify); + if (ret) + goto out_platform_device; + + return ret; out_platform_device: platform_device_unregister(pf_device); @@ -763,6 +768,8 @@ static int acpi_add(struct acpi_device *device) static void acpi_remove(struct acpi_device *device) { + acpi_device_remove_event_handler(device, ACPI_DEVICE_NOTIFY, acpi_notify); + sysfs_remove_group(&pf_device->dev.kobj, &dev_attribute_group); led_classdev_unregister(&tpad_led); @@ -788,7 +795,6 @@ static struct acpi_driver acpi_driver = { .ops = { .add = acpi_add, .remove = acpi_remove, - .notify = acpi_notify, }, .owner = THIS_MODULE, };