From: Liu Jiang <liuj97@gmail.com>
To: Tejun Heo <tj@kernel.org>
Cc: Liu Jiang <liu97@gmail.com>, Matthew Garrett <mjg@redhat.com>,
Aaron Lu <aaron.lu@intel.com>,
linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
Liu Jiang <jiang.liu@huawei.com>
Subject: [PATCH] libata: remove dead code from libata-acpi.c
Date: Sat, 15 Jun 2013 11:02:48 +0800 [thread overview]
Message-ID: <1371265368-7334-1-git-send-email-liuj97@gmail.com> (raw)
From: Liu Jiang <liu97@gmail.com>
Commit 30dcf76acc69 "libata: migrate ACPI code over to new bindings"
removed ACPI dock notification related code, but there's some dead
code left, so clean up it.
Cc: Tejun Heo <tj@kernel.org>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Aaron Lu <aaron.lu@intel.com>
Cc: linux-ide@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Liu Jiang <jiang.liu@huawei.com>
---
drivers/ata/libata-acpi.c | 123 ----------------------------------------------
1 file changed, 123 deletions(-)
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 87f2f39..e50c987 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -91,129 +91,6 @@ acpi_handle ata_dev_acpi_handle(struct ata_device *dev)
}
EXPORT_SYMBOL(ata_dev_acpi_handle);
-/* @ap and @dev are the same as ata_acpi_handle_hotplug() */
-static void ata_acpi_detach_device(struct ata_port *ap, struct ata_device *dev)
-{
- if (dev)
- dev->flags |= ATA_DFLAG_DETACH;
- else {
- struct ata_link *tlink;
- struct ata_device *tdev;
-
- ata_for_each_link(tlink, ap, EDGE)
- ata_for_each_dev(tdev, tlink, ALL)
- tdev->flags |= ATA_DFLAG_DETACH;
- }
-
- ata_port_schedule_eh(ap);
-}
-
-/**
- * ata_acpi_handle_hotplug - ACPI event handler backend
- * @ap: ATA port ACPI event occurred
- * @dev: ATA device ACPI event occurred (can be NULL)
- * @event: ACPI event which occurred
- *
- * All ACPI bay / device realted events end up in this function. If
- * the event is port-wide @dev is NULL. If the event is specific to a
- * device, @dev points to it.
- *
- * Hotplug (as opposed to unplug) notification is always handled as
- * port-wide while unplug only kills the target device on device-wide
- * event.
- *
- * LOCKING:
- * ACPI notify handler context. May sleep.
- */
-static void ata_acpi_handle_hotplug(struct ata_port *ap, struct ata_device *dev,
- u32 event)
-{
- struct ata_eh_info *ehi = &ap->link.eh_info;
- int wait = 0;
- unsigned long flags;
-
- spin_lock_irqsave(ap->lock, flags);
- /*
- * When dock driver calls into the routine, it will always use
- * ACPI_NOTIFY_BUS_CHECK/ACPI_NOTIFY_DEVICE_CHECK for add and
- * ACPI_NOTIFY_EJECT_REQUEST for remove
- */
- switch (event) {
- case ACPI_NOTIFY_BUS_CHECK:
- case ACPI_NOTIFY_DEVICE_CHECK:
- ata_ehi_push_desc(ehi, "ACPI event");
-
- ata_ehi_hotplugged(ehi);
- ata_port_freeze(ap);
- break;
- case ACPI_NOTIFY_EJECT_REQUEST:
- ata_ehi_push_desc(ehi, "ACPI event");
-
- ata_acpi_detach_device(ap, dev);
- wait = 1;
- break;
- }
-
- spin_unlock_irqrestore(ap->lock, flags);
-
- if (wait)
- ata_port_wait_eh(ap);
-}
-
-static void ata_acpi_dev_notify_dock(acpi_handle handle, u32 event, void *data)
-{
- struct ata_device *dev = data;
-
- ata_acpi_handle_hotplug(dev->link->ap, dev, event);
-}
-
-static void ata_acpi_ap_notify_dock(acpi_handle handle, u32 event, void *data)
-{
- struct ata_port *ap = data;
-
- ata_acpi_handle_hotplug(ap, NULL, event);
-}
-
-static void ata_acpi_uevent(struct ata_port *ap, struct ata_device *dev,
- u32 event)
-{
- struct kobject *kobj = NULL;
- char event_string[20];
- char *envp[] = { event_string, NULL };
-
- if (dev) {
- if (dev->sdev)
- kobj = &dev->sdev->sdev_gendev.kobj;
- } else
- kobj = &ap->dev->kobj;
-
- if (kobj) {
- snprintf(event_string, 20, "BAY_EVENT=%d", event);
- kobject_uevent_env(kobj, KOBJ_CHANGE, envp);
- }
-}
-
-static void ata_acpi_ap_uevent(acpi_handle handle, u32 event, void *data)
-{
- ata_acpi_uevent(data, NULL, event);
-}
-
-static void ata_acpi_dev_uevent(acpi_handle handle, u32 event, void *data)
-{
- struct ata_device *dev = data;
- ata_acpi_uevent(dev->link->ap, dev, event);
-}
-
-static const struct acpi_dock_ops ata_acpi_dev_dock_ops = {
- .handler = ata_acpi_dev_notify_dock,
- .uevent = ata_acpi_dev_uevent,
-};
-
-static const struct acpi_dock_ops ata_acpi_ap_dock_ops = {
- .handler = ata_acpi_ap_notify_dock,
- .uevent = ata_acpi_ap_uevent,
-};
-
/**
* ata_acpi_dissociate - dissociate ATA host from ACPI objects
* @host: target ATA host
--
1.8.1.2
next reply other threads:[~2013-06-15 3:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-15 3:02 Liu Jiang [this message]
2013-06-17 1:50 ` [PATCH] libata: remove dead code from libata-acpi.c Aaron Lu
2013-06-17 18:01 ` Tejun Heo
2013-06-18 1:15 ` Jiang Liu (Gerry)
2013-06-18 1:15 ` Jiang Liu (Gerry)
2013-06-18 9:16 ` Aaron Lu
2013-06-20 2:26 ` Aaron Lu
2013-06-20 11:02 ` Sergei Shtylyov
2013-06-21 0:55 ` Aaron Lu
2013-06-21 6:29 ` Tejun Heo
2013-06-21 6:48 ` Aaron Lu
2013-06-21 11:35 ` Sergei Shtylyov
2013-06-26 6:27 ` Aaron Lu
2013-06-21 15:25 ` James Bottomley
2013-06-26 2:01 ` Aaron Lu
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=1371265368-7334-1-git-send-email-liuj97@gmail.com \
--to=liuj97@gmail.com \
--cc=aaron.lu@intel.com \
--cc=jiang.liu@huawei.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liu97@gmail.com \
--cc=mjg@redhat.com \
--cc=tj@kernel.org \
/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.