All of lore.kernel.org
 help / color / mirror / Atom feed
From: "David Härdeman" <david@hardeman.nu>
To: linux-kernel@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, linux-input@vger.kernel.org,
	jbarnes@virtuousgeek.org, "David Härdeman" <david@hardeman.nu>
Subject: [PATCH 1/2] ACPI: reintroduce acpi_device_ops .shutdown method
Date: Sat, 27 Jun 2009 07:18:31 +0200	[thread overview]
Message-ID: <1246079912-17619-2-git-send-email-david@hardeman.nu> (raw)
In-Reply-To: <1246079912-17619-1-git-send-email-david@hardeman.nu>

This reintroduces the .shutdown method which is used by the
winbond-cir driver. A normal revert wasn't possible since there
had been other changes to include/acpi/acpi_bus.h since.

Signed-off-by: David Härdeman <david@hardeman.nu>
---
 drivers/acpi/scan.c     |   12 ++++++++++++
 include/acpi/acpi_bus.h |    2 ++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d..c94ab13 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -464,10 +464,22 @@ static int acpi_device_remove(struct device * dev)
 	return 0;
 }
 
+static void acpi_device_shutdown(struct device *dev)
+{
+	struct acpi_device *acpi_dev = to_acpi_device(dev);
+	struct acpi_driver *acpi_drv = acpi_dev->driver;
+
+	if (acpi_drv && acpi_drv->ops.shutdown)
+		acpi_drv->ops.shutdown(acpi_dev);
+
+	return ;
+}
+
 struct bus_type acpi_bus_type = {
 	.name		= "acpi",
 	.suspend	= acpi_device_suspend,
 	.resume		= acpi_device_resume,
+	.shutdown	= acpi_device_shutdown,
 	.match		= acpi_bus_match,
 	.probe		= acpi_device_probe,
 	.remove		= acpi_device_remove,
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c65e4ce..52da89a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -96,6 +96,7 @@ typedef int (*acpi_op_resume) (struct acpi_device * device);
 typedef int (*acpi_op_bind) (struct acpi_device * device);
 typedef int (*acpi_op_unbind) (struct acpi_device * device);
 typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);
+typedef int (*acpi_op_shutdown) (struct acpi_device * device);
 
 struct acpi_bus_ops {
 	u32 acpi_op_add:1;
@@ -112,6 +113,7 @@ struct acpi_device_ops {
 	acpi_op_bind bind;
 	acpi_op_unbind unbind;
 	acpi_op_notify notify;
+	acpi_op_shutdown shutdown;
 };
 
 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
-- 
1.6.3.1

--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

WARNING: multiple messages have this Message-ID (diff)
From: "David Härdeman" <david@hardeman.nu>
To: linux-kernel@vger.kernel.org
Cc: linux-acpi@vger.kernel.org, linux-input@vger.kernel.org,
	jbarnes@virtuousgeek.org, "David Härdeman" <david@hardeman.nu>
Subject: [PATCH 1/2] ACPI: reintroduce acpi_device_ops .shutdown method
Date: Sat, 27 Jun 2009 07:18:31 +0200	[thread overview]
Message-ID: <1246079912-17619-2-git-send-email-david@hardeman.nu> (raw)
In-Reply-To: <1246079912-17619-1-git-send-email-david@hardeman.nu>

This reintroduces the .shutdown method which is used by the
winbond-cir driver. A normal revert wasn't possible since there
had been other changes to include/acpi/acpi_bus.h since.

Signed-off-by: David Härdeman <david@hardeman.nu>
---
 drivers/acpi/scan.c     |   12 ++++++++++++
 include/acpi/acpi_bus.h |    2 ++
 2 files changed, 14 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 781435d..c94ab13 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -464,10 +464,22 @@ static int acpi_device_remove(struct device * dev)
 	return 0;
 }
 
+static void acpi_device_shutdown(struct device *dev)
+{
+	struct acpi_device *acpi_dev = to_acpi_device(dev);
+	struct acpi_driver *acpi_drv = acpi_dev->driver;
+
+	if (acpi_drv && acpi_drv->ops.shutdown)
+		acpi_drv->ops.shutdown(acpi_dev);
+
+	return ;
+}
+
 struct bus_type acpi_bus_type = {
 	.name		= "acpi",
 	.suspend	= acpi_device_suspend,
 	.resume		= acpi_device_resume,
+	.shutdown	= acpi_device_shutdown,
 	.match		= acpi_bus_match,
 	.probe		= acpi_device_probe,
 	.remove		= acpi_device_remove,
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index c65e4ce..52da89a 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -96,6 +96,7 @@ typedef int (*acpi_op_resume) (struct acpi_device * device);
 typedef int (*acpi_op_bind) (struct acpi_device * device);
 typedef int (*acpi_op_unbind) (struct acpi_device * device);
 typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);
+typedef int (*acpi_op_shutdown) (struct acpi_device * device);
 
 struct acpi_bus_ops {
 	u32 acpi_op_add:1;
@@ -112,6 +113,7 @@ struct acpi_device_ops {
 	acpi_op_bind bind;
 	acpi_op_unbind unbind;
 	acpi_op_notify notify;
+	acpi_op_shutdown shutdown;
 };
 
 #define ACPI_DRIVER_ALL_NOTIFY_EVENTS	0x1	/* system AND device events */
-- 
1.6.3.1


  reply	other threads:[~2009-06-27  5:18 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-27  5:18 [PATCH 0/2] Winbond IR driver David Härdeman
2009-06-27  5:18 ` David Härdeman
2009-06-27  5:18 ` David Härdeman [this message]
2009-06-27  5:18   ` [PATCH 1/2] ACPI: reintroduce acpi_device_ops .shutdown method David Härdeman
2009-06-30 21:10   ` Andrew Morton
2009-06-30 21:10     ` Andrew Morton
2009-06-30 23:11     ` Bjorn Helgaas
2009-07-01  8:20       ` David Härdeman
2009-07-01  8:20         ` David Härdeman
2009-07-08 16:52         ` Bjorn Helgaas
2009-07-08 16:52           ` Bjorn Helgaas
2009-07-09 21:38           ` [PATCH 0/2] Winbond driver as PNP Bjorn Helgaas
2009-07-09 21:38             ` Bjorn Helgaas
2009-07-09 21:39             ` [PATCH 1/2] PNP: add .shutdown method Bjorn Helgaas
2009-07-09 21:40             ` [PATCH 2/2] Winbond: convert from ACPI to PNP driver Bjorn Helgaas
2009-07-09 21:40               ` Bjorn Helgaas
2009-07-10  7:55             ` [PATCH 0/2] Winbond driver as PNP David Härdeman
2009-07-10  7:55               ` David Härdeman
2009-07-10 16:01               ` Bjorn Helgaas
2009-07-10 16:01                 ` Bjorn Helgaas
2009-06-27  5:18 ` [PATCH 2/2] Add a driver for the Winbond WPCD376I IR functionality David Härdeman
2009-06-27  5:18   ` David Härdeman
2009-06-30 21:23   ` Andrew Morton
2009-06-30 21:23     ` Andrew Morton
2009-07-01  7:47     ` David Härdeman
2009-07-01  7:47       ` David Härdeman
2009-07-01 18:06       ` Andrew Morton
2009-07-01 18:06         ` Andrew Morton
2009-07-01 21:45         ` David Härdeman
2009-07-01 21:45           ` David Härdeman
2009-07-01 21:47     ` David Härdeman
2009-07-01 21:47       ` David Härdeman
2009-07-01 21:53       ` Jesse Barnes
2009-07-01 21:53         ` Jesse Barnes

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=1246079912-17619-2-git-send-email-david@hardeman.nu \
    --to=david@hardeman.nu \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.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.