From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux ACPI <linux-acpi@vger.kernel.org>,
Linux PCI <linux-pci@vger.kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Bjorn Helgaas <helgaas@kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 2/3] ACPI: glue: Drop cleanup callback from struct acpi_bus_type
Date: Sat, 18 Sep 2021 14:56:17 +0200 [thread overview]
Message-ID: <7964242.T7Z3S40VBb@kreacher> (raw)
In-Reply-To: <1794818.tdWV9SEqCh@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Since PCI was the only user of the ->cleanup callback in struct
acpi_bus_type and it is not using struct acpi_bus_type any more,
drop that callback from there and update acpi_device_notify_remove()
accordingly.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/glue.c | 12 +++---------
include/acpi/acpi_bus.h | 1 -
2 files changed, 3 insertions(+), 10 deletions(-)
Index: linux-pm/include/acpi/acpi_bus.h
===================================================================
--- linux-pm.orig/include/acpi/acpi_bus.h
+++ linux-pm/include/acpi/acpi_bus.h
@@ -570,7 +570,6 @@ struct acpi_bus_type {
bool (*match)(struct device *dev);
struct acpi_device * (*find_companion)(struct device *);
void (*setup)(struct device *);
- void (*cleanup)(struct device *);
};
int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *);
Index: linux-pm/drivers/acpi/glue.c
===================================================================
--- linux-pm.orig/drivers/acpi/glue.c
+++ linux-pm/drivers/acpi/glue.c
@@ -337,16 +337,10 @@ void acpi_device_notify_remove(struct de
if (!adev)
return;
- if (dev_is_pci(dev)) {
+ if (dev_is_pci(dev))
pci_acpi_cleanup(dev, adev);
- } else {
- struct acpi_bus_type *type = acpi_get_bus_type(dev);
-
- if (type && type->cleanup)
- type->cleanup(dev);
- else if (adev->handler && adev->handler->unbind)
- adev->handler->unbind(dev);
- }
+ else if (adev->handler && adev->handler->unbind)
+ adev->handler->unbind(dev);
acpi_unbind_one(dev);
}
next prev parent reply other threads:[~2021-09-18 13:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-18 12:51 [PATCH v1 0/3] PCI: ACPI: glue: Get rid of acpi_pci_bus and rearrange code Rafael J. Wysocki
2021-09-18 12:53 ` [PATCH v1 1/3] PCI: ACPI: Drop acpi_pci_bus Rafael J. Wysocki
2021-09-18 12:56 ` Rafael J. Wysocki [this message]
2021-09-18 13:02 ` [PATCH v1 3/3] ACPI: glue: Look for ACPI bus type only if ACPI companion is not known Rafael J. Wysocki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7964242.T7Z3S40VBb@kreacher \
--to=rjw@rjwysocki.net \
--cc=andriy.shevchenko@linux.intel.com \
--cc=helgaas@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.