From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>
Subject: linux-next: manual merge of the pm tree with the pci tree
Date: Wed, 20 Feb 2013 12:55:55 +1100 [thread overview]
Message-ID: <20130220125555.46e16e16836ba48f70beb3a9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2045 bytes --]
Hi Rafael,
Today's linux-next merge of the pm tree got a conflict in
drivers/pci/pci-acpi.c between commit 181380b702ee ("PCI/ACPI: Don't
cache _PRT, and don't associate them with bus numbers") from the pci tree
and commit bc9b6407bd6d ("ACPI / PM: Rework the handling of devices
depending on power resources") from the pm tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/pci/pci-acpi.c
index c685ff5,e407c61..0000000
--- a/drivers/pci/pci-acpi.c
+++ b/drivers/pci/pci-acpi.c
@@@ -307,8 -325,26 +307,7 @@@ static void pci_acpi_setup(struct devic
struct pci_dev *pci_dev = to_pci_dev(dev);
acpi_handle handle = ACPI_HANDLE(dev);
struct acpi_device *adev;
- acpi_status status;
- acpi_handle dummy;
-
- /*
- * Evaluate and parse _PRT, if exists. This code allows parsing of
- * _PRT objects within the scope of non-bridge devices. Note that
- * _PRTs within the scope of a PCI bridge assume the bridge's
- * subordinate bus number.
- *
- * TBD: Can _PRTs exist within the scope of non-bridge PCI devices?
- */
- status = acpi_get_handle(handle, METHOD_NAME__PRT, &dummy);
- if (ACPI_SUCCESS(status)) {
- unsigned char bus;
-
- bus = pci_dev->subordinate ?
- pci_dev->subordinate->number : pci_dev->bus->number;
- acpi_pci_irq_add_prt(handle, pci_domain_nr(pci_dev->bus), bus);
- }
- acpi_power_resource_register_device(dev, handle);
if (acpi_bus_get_device(handle, &adev) || !adev->wakeup.flags.valid)
return;
@@@ -330,7 -367,10 +329,6 @@@ static void pci_acpi_cleanup(struct dev
device_set_run_wake(dev, false);
pci_acpi_remove_pm_notifier(adev);
}
- acpi_power_resource_unregister_device(dev, handle);
-
- if (pci_dev->subordinate)
- acpi_pci_irq_del_prt(pci_domain_nr(pci_dev->bus),
- pci_dev->subordinate->number);
}
static struct acpi_bus_type acpi_pci_bus = {
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2013-02-20 1:56 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-20 1:55 Stephen Rothwell [this message]
2013-02-20 12:57 ` linux-next: manual merge of the pm tree with the pci tree Rafael J. Wysocki
-- strict thread matches above, loose matches on Subject: below --
2019-11-24 23:13 Stephen Rothwell
2019-11-25 14:06 ` Rafael J. Wysocki
2019-11-27 23:58 ` Stephen Rothwell
2019-07-01 3:24 Stephen Rothwell
2015-02-11 1:07 Stephen Rothwell
2015-02-11 1:41 ` Rafael J. Wysocki
2015-02-11 2:03 ` Rafael J. Wysocki
2015-02-11 2:05 ` Lorenzo Pieralisi
2013-06-27 3:02 Stephen Rothwell
2013-04-16 2:46 Stephen Rothwell
2013-04-16 17:53 ` Rafael J. Wysocki
2013-02-18 1:17 Stephen Rothwell
2013-02-18 12:28 ` Rafael J. Wysocki
2013-02-18 1:11 Stephen Rothwell
2013-02-18 12:30 ` Rafael J. Wysocki
2013-02-15 1:23 Stephen Rothwell
2013-02-15 12:51 ` Rafael J. Wysocki
2013-01-30 8:35 Stephen Rothwell
2013-01-30 12:48 ` Rafael J. Wysocki
2013-01-10 0:28 Stephen Rothwell
2013-01-10 13:12 ` Rafael J. Wysocki
2013-01-10 18:30 ` Bjorn Helgaas
2012-11-06 2:48 Stephen Rothwell
2012-11-06 16:52 ` Bjorn Helgaas
2012-11-16 10:17 ` 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=20130220125555.46e16e16836ba48f70beb3a9@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=rjw@sisk.pl \
--cc=yinghai@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).