From: "Rafael J. Wysocki" <rjw@sisk.pl>
To: ACPI Devel Maling List <linux-acpi@vger.kernel.org>
Cc: Alan Stern <stern@rowland.harvard.edu>,
Andi Kleen <andi@firstfloor.org>,
Jesse Barnes <jbarnes@virtuousgeek.org>,
pm list <linux-pm@lists.linux-foundation.org>,
Zhang Rui <rui.zhang@intel.com>,
Zhao Yakui <yakui.zhao@intel.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
Tobias Diedrich <ranma@tdiedrich.de>,
Jeff Garzik <jeff@garzik.org>
Subject: [PATCH 1/9] PCI ACPI: Remove acpi_platform_enable_wakeup
Date: Wed, 2 Jul 2008 00:00:11 +0200 [thread overview]
Message-ID: <200807020000.12964.rjw@sisk.pl> (raw)
In-Reply-To: <200807012356.26669.rjw@sisk.pl>
From: Rafael J. Wysocki <rjw@sisk.pl>
PCI ACPI: Remove acpi_platform_enable_wakeup
This patch removes "Fix forcedeth hibernate/wake-on-lan problems",
commit f5ccbcfacaae57e3312e623432a79d5f1f079cf5 in linux-next,
which is incorrect, because it directly manipulates the
wakeup.state.enabled flags of ACPI devices while these flags are
supposed to be used by the user space to control wake-up. Moreover,
it affects not only the device it is supposed to fix (forcedeth), but
also every PCI device that happens to call
device_init_wakeup(dev, 1).
Apart from this, it has been pushed as a network driver fix, while it should
have gone through either ACPI or PCI tree. Also, the other patches in this
series are intended to fix the issue it was supposed to fix, but in a more
complete way.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---
drivers/pci/pci-acpi.c | 20 --------------------
1 file changed, 20 deletions(-)
Index: linux-next/drivers/pci/pci-acpi.c
===================================================================
--- linux-next.orig/drivers/pci/pci-acpi.c
+++ linux-next/drivers/pci/pci-acpi.c
@@ -259,25 +259,6 @@ static pci_power_t acpi_pci_choose_state
}
return PCI_POWER_ERROR;
}
-
-static int acpi_platform_enable_wakeup(struct device *dev, int is_on)
-{
- struct acpi_device *adev;
- int status;
-
- if (!device_can_wakeup(dev))
- return -EINVAL;
-
- if (is_on && !device_may_wakeup(dev))
- return -EINVAL;
-
- status = acpi_bus_get_device(DEVICE_ACPI_HANDLE(dev), &adev);
- if (status < 0)
- return status;
-
- adev->wakeup.state.enabled = !!is_on;
- return 0;
-}
#endif
static int acpi_pci_set_power_state(struct pci_dev *dev, pci_power_t state)
@@ -362,7 +343,6 @@ static int __init acpi_pci_init(void)
return 0;
#ifdef CONFIG_ACPI_SLEEP
platform_pci_choose_state = acpi_pci_choose_state;
- platform_enable_wakeup = acpi_platform_enable_wakeup;
#endif
platform_pci_set_power_state = acpi_pci_set_power_state;
return 0;
next prev parent reply other threads:[~2008-07-01 22:13 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-01 21:56 [PATCH 0/9] PCI PM: Handling of PCI devices wake-up functionality (rev. 3) Rafael J. Wysocki
2008-07-01 22:00 ` [PATCH 1/9] PCI ACPI: Remove acpi_platform_enable_wakeup Rafael J. Wysocki
2008-07-01 22:00 ` Rafael J. Wysocki [this message]
2008-07-01 22:03 ` [PATCH 2/9] ACPI: Introduce acpi_bus_power_manageable function Rafael J. Wysocki
2008-07-01 22:03 ` Rafael J. Wysocki
2008-07-01 22:04 ` [PATCH 3/9] PCI: Introduce platform_pci_power_manageable function Rafael J. Wysocki
2008-07-01 22:04 ` Rafael J. Wysocki
2008-07-01 22:05 ` [PATCH 4/9] PCI: Rework pci_set_power_state function (rev. 3) Rafael J. Wysocki
2008-07-01 22:05 ` Rafael J. Wysocki
2008-07-01 22:06 ` [PATCH 5/9] ACPI: Introduce acpi_device_sleep_wake function Rafael J. Wysocki
2008-07-01 22:06 ` Rafael J. Wysocki
2008-07-01 22:07 ` [PATCH 6/9] ACPI: Introduce new device wakeup flag 'prepared' Rafael J. Wysocki
2008-07-01 22:07 ` Rafael J. Wysocki
2008-07-01 22:08 ` [PATCH 7/9] PCI ACPI: Rework PCI handling of wake-up (rev. 4) Rafael J. Wysocki
2008-07-01 22:08 ` Rafael J. Wysocki
2008-07-02 7:30 ` Zhao Yakui
2008-07-02 10:16 ` Rafael J. Wysocki
2008-07-02 10:16 ` Rafael J. Wysocki
2008-07-02 7:30 ` Zhao Yakui
2008-07-01 22:09 ` [PATCH 8/9] PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep Rafael J. Wysocki
2008-07-01 22:09 ` Rafael J. Wysocki
2008-07-01 22:10 ` [PATCH 9/9] PCI: Simplify PCI device PM code (rev. 4) Rafael J. Wysocki
2008-07-01 22:10 ` Rafael J. Wysocki
2008-07-03 12:04 ` [PATCH 0/9] PCI PM: Handling of PCI devices wake-up functionality (rev. 3) Rafael J. Wysocki
2008-07-07 1:30 ` [PATCH 0/8] PCI PM: Handling of PCI devices wake-up functionality (rev. 4) Rafael J. Wysocki
2008-07-07 1:30 ` [PATCH 1/8] ACPI: Introduce acpi_bus_power_manageable function Rafael J. Wysocki
2008-07-07 1:30 ` Rafael J. Wysocki
2008-07-07 1:32 ` [PATCH 2/8] PCI: Introduce platform_pci_power_manageable function Rafael J. Wysocki
2008-07-07 1:32 ` Rafael J. Wysocki
2008-07-07 1:32 ` [PATCH 3/8] PCI: Rework pci_set_power_state function (rev. 4) Rafael J. Wysocki
2008-07-07 1:32 ` Rafael J. Wysocki
2008-07-07 1:33 ` [PATCH 4/8] ACPI: Introduce acpi_device_sleep_wake function Rafael J. Wysocki
2008-07-07 1:33 ` Rafael J. Wysocki
2008-07-07 1:34 ` [PATCH 5/8] ACPI: Introduce new device wakeup flag 'prepared' Rafael J. Wysocki
2008-07-07 14:08 ` Pavel Machek
2008-07-07 14:08 ` Pavel Machek
2008-07-07 1:34 ` Rafael J. Wysocki
2008-07-07 1:34 ` [PATCH 6/8] PCI ACPI: Rework PCI handling of wake-up (rev. 5) Rafael J. Wysocki
2008-07-07 1:34 ` Rafael J. Wysocki
2008-07-11 20:30 ` Pavel Machek
2008-07-11 20:30 ` Pavel Machek
2008-07-07 1:35 ` [PATCH 7/8] PCI PM: Introduce pci_prepare_to_sleep and pci_back_from_sleep Rafael J. Wysocki
2008-07-11 20:31 ` Pavel Machek
2008-07-11 20:31 ` Pavel Machek
2008-07-07 1:35 ` Rafael J. Wysocki
2008-07-07 1:36 ` [PATCH 8/8] PCI: Simplify PCI device PM code (rev. 4) Rafael J. Wysocki
2008-07-07 1:36 ` Rafael J. Wysocki
2008-07-11 20:37 ` Pavel Machek
2008-07-11 20:45 ` Rafael J. Wysocki
2008-07-11 20:45 ` Rafael J. Wysocki
2008-07-11 20:49 ` Pavel Machek
2008-07-11 20:49 ` Pavel Machek
2008-07-11 20:37 ` Pavel Machek
2008-07-08 0:49 ` [PATCH 0/8] PCI PM: Handling of PCI devices wake-up functionality " Jesse Barnes
2008-07-08 14:42 ` Rafael J. Wysocki
2008-07-08 14:42 ` Rafael J. Wysocki
2008-07-13 20:45 ` PCI PM: Fix pci_prepare_to_sleep Rafael J. Wysocki
2008-07-13 20:45 ` Rafael J. Wysocki
2008-07-14 21:27 ` Jesse Barnes
2008-07-14 21:40 ` Rafael J. Wysocki
2008-07-14 21:40 ` Rafael J. Wysocki
2008-07-07 1:30 ` [PATCH 0/8] PCI PM: Handling of PCI devices wake-up functionality (rev. 4) 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=200807020000.12964.rjw@sisk.pl \
--to=rjw@sisk.pl \
--cc=andi@firstfloor.org \
--cc=jbarnes@virtuousgeek.org \
--cc=jeff@garzik.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-pm@lists.linux-foundation.org \
--cc=ranma@tdiedrich.de \
--cc=rui.zhang@intel.com \
--cc=sfr@canb.auug.org.au \
--cc=stern@rowland.harvard.edu \
--cc=yakui.zhao@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.