From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.0 required=3.0 tests=BAYES_00,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 706D6C433ED for ; Mon, 12 Apr 2021 17:32:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 490EE61246 for ; Mon, 12 Apr 2021 17:32:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241672AbhDLRc1 (ORCPT ); Mon, 12 Apr 2021 13:32:27 -0400 Received: from mail-oi1-f179.google.com ([209.85.167.179]:42677 "EHLO mail-oi1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240002AbhDLRc1 (ORCPT ); Mon, 12 Apr 2021 13:32:27 -0400 Received: by mail-oi1-f179.google.com with SMTP id n140so14186670oig.9; Mon, 12 Apr 2021 10:32:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YLPU8jk19ohQxtufiVwASUPSrtowgcZRi3OfC78Zk+8=; b=ggz9J2THSAeg68jr+wRYeWxr2zlzE5K82Cm9Dx7V4iSOwiFKG2KnZhafmx1TsuZxiC NpJQKEDxhYmN9TGBUrZoyugaJ7j65y7PaAWl87bo8L2c6uoj8lTmOtqpEy45C0R2eC6E BnoC3gcQc1j8frHRVUDAYzsBt4Ohm5wuj0qwRcIQ0dH3mPtJf7i8xpOTN6SKOI3EOH6L xMN2ihCbdTA1fHoEhtNEpDNNoEWE13aZ+xIh3cefEMRiVtME9bCnZSpuwYXK949l7+di 46eUq/RHEFbv+wQC/WtbTpRfuxMXaii3tSVt6YD9ON2ImX8KnvraoSUd1dMbxaf4hwis t6Ew== X-Gm-Message-State: AOAM531oegKSItG+QYrWVasjtIXP0uAVY6WwanXVeQ+yd80GQPNgQGji EneShHV8IkkCyzXgKnyVIlWCHrUIgwBu2rPSfOc= X-Google-Smtp-Source: ABdhPJz7f9ByOiHU75WursIJMXSHYO6D3IQ9Qm7IsXChFae6vpAIfsUm7feU2wa5rLTrTViPvUXE9xFyasqUmEKc8Qg= X-Received: by 2002:aca:aa8f:: with SMTP id t137mr184867oie.71.1618248728794; Mon, 12 Apr 2021 10:32:08 -0700 (PDT) MIME-Version: 1.0 References: <20210410134718.1942273-1-andy.shevchenko@gmail.com> In-Reply-To: <20210410134718.1942273-1-andy.shevchenko@gmail.com> From: "Rafael J. Wysocki" Date: Mon, 12 Apr 2021 19:31:57 +0200 Message-ID: Subject: Re: [PATCH v1 1/1] ACPI: bus: Introduce acpi_dev_get() and reuse it in ACPI code To: Andy Shevchenko Cc: Dwaipayan Ray , "Rafael J. Wysocki" , ACPI Devel Maling List , Linux Kernel Mailing List , "open list:ACPI COMPONENT ARCHITECTURE (ACPICA)" , "Rafael J. Wysocki" , Len Brown , Robert Moore , Erik Kaneda Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Sat, Apr 10, 2021 at 3:47 PM Andy Shevchenko wrote: > > Introduce acpi_dev_get() to have a symmetrical API with acpi_dev_put() > and reuse both in ACPI code under drivers/acpi folder. > > While at it, use acpi_bus_put_acpi_device() in one place rather than above. > > Signed-off-by: Andy Shevchenko > --- > drivers/acpi/device_sysfs.c | 4 ++-- > drivers/acpi/glue.c | 8 ++++---- > drivers/acpi/scan.c | 9 ++++----- > include/acpi/acpi_bus.h | 6 ++++++ > 4 files changed, 16 insertions(+), 11 deletions(-) > > diff --git a/drivers/acpi/device_sysfs.c b/drivers/acpi/device_sysfs.c > index da4ff2a8b06a..35757c3c1b71 100644 > --- a/drivers/acpi/device_sysfs.c > +++ b/drivers/acpi/device_sysfs.c > @@ -376,12 +376,12 @@ eject_store(struct device *d, struct device_attribute *attr, > if (ACPI_FAILURE(status) || !acpi_device->flags.ejectable) > return -ENODEV; > > - get_device(&acpi_device->dev); > + acpi_dev_get(acpi_device); > status = acpi_hotplug_schedule(acpi_device, ACPI_OST_EC_OSPM_EJECT); > if (ACPI_SUCCESS(status)) > return count; > > - put_device(&acpi_device->dev); > + acpi_dev_put(acpi_device); > acpi_evaluate_ost(acpi_device->handle, ACPI_OST_EC_OSPM_EJECT, > ACPI_OST_SC_NON_SPECIFIC_FAILURE, NULL); > return status == AE_NO_MEMORY ? -ENOMEM : -EAGAIN; > diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c > index 36b24b0658cb..0715e3be99a0 100644 > --- a/drivers/acpi/glue.c > +++ b/drivers/acpi/glue.c > @@ -190,7 +190,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) > if (!acpi_dev) > return -EINVAL; > > - get_device(&acpi_dev->dev); > + acpi_dev_get(acpi_dev); > get_device(dev); > physical_node = kzalloc(sizeof(*physical_node), GFP_KERNEL); > if (!physical_node) { > @@ -217,7 +217,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) > goto err; > > put_device(dev); > - put_device(&acpi_dev->dev); > + acpi_dev_put(acpi_dev); > return 0; > } > if (pn->node_id == node_id) { > @@ -257,7 +257,7 @@ int acpi_bind_one(struct device *dev, struct acpi_device *acpi_dev) > err: > ACPI_COMPANION_SET(dev, NULL); > put_device(dev); > - put_device(&acpi_dev->dev); > + acpi_dev_put(acpi_dev); > return retval; > } > EXPORT_SYMBOL_GPL(acpi_bind_one); > @@ -285,7 +285,7 @@ int acpi_unbind_one(struct device *dev) > ACPI_COMPANION_SET(dev, NULL); > /* Drop references taken by acpi_bind_one(). */ > put_device(dev); > - put_device(&acpi_dev->dev); > + acpi_dev_put(acpi_dev); > kfree(entry); > break; > } > diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c > index ad2541c0aece..bba6b529cf6c 100644 > --- a/drivers/acpi/scan.c > +++ b/drivers/acpi/scan.c > @@ -530,7 +530,7 @@ static void acpi_device_del_work_fn(struct work_struct *work_not_used) > * used by the device. > */ > acpi_power_transition(adev, ACPI_STATE_D3_COLD); > - put_device(&adev->dev); > + acpi_dev_put(adev); > } > } > > @@ -604,8 +604,7 @@ EXPORT_SYMBOL(acpi_bus_get_device); > > static void get_acpi_device(void *dev) > { > - if (dev) > - get_device(&((struct acpi_device *)dev)->dev); > + acpi_dev_get(dev); I would do if (dev) acpi_dev_get(dev); here. > } > > struct acpi_device *acpi_bus_get_acpi_device(acpi_handle handle) > @@ -615,7 +614,7 @@ struct acpi_device *acpi_bus_get_acpi_device(acpi_handle handle) > > void acpi_bus_put_acpi_device(struct acpi_device *adev) > { > - put_device(&adev->dev); > + acpi_dev_put(adev); > } > > static struct acpi_device_bus_id *acpi_device_bus_id_match(const char *dev_id) > @@ -2386,7 +2385,7 @@ int __init acpi_scan_init(void) > acpi_detach_data(acpi_root->handle, > acpi_scan_drop_device); > acpi_device_del(acpi_root); > - put_device(&acpi_root->dev); > + acpi_bus_put_acpi_device(acpi_root); > goto out; > } > } > diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h > index 834b7a1f7405..b728173a6171 100644 > --- a/include/acpi/acpi_bus.h > +++ b/include/acpi/acpi_bus.h > @@ -707,6 +707,12 @@ acpi_dev_get_first_match_dev(const char *hid, const char *uid, s64 hrv); > adev; \ > adev = acpi_dev_get_next_match_dev(adev, hid, uid, hrv)) > > +static inline void acpi_dev_get(struct acpi_device *adev) > +{ > + if (adev) > + get_device(&adev->dev); And I would drop the adev check from here (because the code calling it may be running with wrong assumptions if adev is NULL). Or it should return adev and the caller should be held responsible for checking it against NULL (if they care). > +} > + > static inline void acpi_dev_put(struct acpi_device *adev) > { > put_device(&adev->dev); > --