| Message ID | 1353349642-3677-217-git-send-email-wfp5p@virginia.edu (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > needed. Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. Thanks, Rafael > Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> > Cc: linux-acpi@vger.kernel.org > --- > drivers/acpi/apei/ghes.c | 2 +- > drivers/acpi/hed.c | 2 +- > drivers/acpi/pci_root.c | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 1599566..73bca11 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -901,7 +901,7 @@ static unsigned long ghes_esource_prealloc_size( > return prealloc_size; > } > > -static int __devinit ghes_probe(struct platform_device *ghes_dev) > +static int ghes_probe(struct platform_device *ghes_dev) > { > struct acpi_hest_generic *generic; > struct ghes *ghes = NULL; > diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c > index 20a0f2c..0ec28a3 100644 > --- a/drivers/acpi/hed.c > +++ b/drivers/acpi/hed.c > @@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event) > blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL); > } > > -static int __devinit acpi_hed_add(struct acpi_device *device) > +static int acpi_hed_add(struct acpi_device *device) > { > /* Only one hardware error device */ > if (hed_handle) > diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c > index ab781f0..7928d4d 100644 > --- a/drivers/acpi/pci_root.c > +++ b/drivers/acpi/pci_root.c > @@ -445,7 +445,7 @@ out: > } > EXPORT_SYMBOL(acpi_pci_osc_control_set); > > -static int __devinit acpi_pci_root_add(struct acpi_device *device) > +static int acpi_pci_root_add(struct acpi_device *device) > { > unsigned long long segment, bus; > acpi_status status; >
On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > needed. > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. And dropped, because it causes build problems to happen in acpi_pci_root_add() in my tree. Thanks, Rafael
On Thu, Nov 22, 2012 at 01:18:09AM +0100, Rafael J. Wysocki wrote: > On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > > needed. > > > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. > > And dropped, because it causes build problems to happen in > acpi_pci_root_add() in my tree. What kind of problems? If CONFIG_HOTPLUG is enabled __devinit defines away to nothing, so this shouldn't have broken anything. thanks, greg k-h -- 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
On Wednesday, November 28, 2012 11:00:02 AM Greg KH wrote: > On Thu, Nov 22, 2012 at 01:18:09AM +0100, Rafael J. Wysocki wrote: > > On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > > > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > > > needed. > > > > > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. > > > > And dropped, because it causes build problems to happen in > > acpi_pci_root_add() in my tree. > > What kind of problems? If CONFIG_HOTPLUG is enabled __devinit defines > away to nothing, so this shouldn't have broken anything. It did, because there's a dependency on PCI, so I would need to merge the PCI patch along with the ACPI one, but I couldn't find the PCI one, so I dropped the ACPI one too. And the fact that the author doesn't seem to care is not encouraging. Thanks, Rafael
On Wed, Nov 28, 2012 at 08:34:43PM +0100, Rafael J. Wysocki wrote: > On Wednesday, November 28, 2012 11:00:02 AM Greg KH wrote: > > On Thu, Nov 22, 2012 at 01:18:09AM +0100, Rafael J. Wysocki wrote: > > > On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > > > > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > > > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > > > > needed. > > > > > > > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. > > > > > > And dropped, because it causes build problems to happen in > > > acpi_pci_root_add() in my tree. > > > > What kind of problems? If CONFIG_HOTPLUG is enabled __devinit defines > > away to nothing, so this shouldn't have broken anything. > > It did, because there's a dependency on PCI, so I would need to merge > the PCI patch along with the ACPI one, but I couldn't find the PCI > one, so I dropped the ACPI one too. Ah, ok, that makes sense. I will be including the PCI ones in my tree soon, once I get Bjorn's ack. > And the fact that the author doesn't seem to care is not encouraging. He does, he's just swamped with real-work at the moment :( greg k-h -- 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
Rafael J. Wysocki writes: > > On Wednesday, November 28, 2012 11:00:02 AM Greg KH wrote: > > On Thu, Nov 22, 2012 at 01:18:09AM +0100, Rafael J. Wysocki wrote: > > > On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > > > > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > > > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > > > > needed. > > > > > > > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. > > > > > > And dropped, because it causes build problems to happen in > > > acpi_pci_root_add() in my tree. > > > > What kind of problems? If CONFIG_HOTPLUG is enabled __devinit defines > > away to nothing, so this shouldn't have broken anything. > > It did, because there's a dependency on PCI, so I would need to merge > the PCI patch along with the ACPI one, but I couldn't find the PCI > one, so I dropped the ACPI one too. > > And the fact that the author doesn't seem to care is not encouraging. > What? Of course I care. I've been trying to address the problems as they come up. I apparently didn't jump on this particular one.
On Wednesday, November 28, 2012 11:38:24 AM Greg KH wrote: > On Wed, Nov 28, 2012 at 08:34:43PM +0100, Rafael J. Wysocki wrote: > > On Wednesday, November 28, 2012 11:00:02 AM Greg KH wrote: > > > On Thu, Nov 22, 2012 at 01:18:09AM +0100, Rafael J. Wysocki wrote: > > > > On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > > > > > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > > > > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > > > > > needed. > > > > > > > > > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. > > > > > > > > And dropped, because it causes build problems to happen in > > > > acpi_pci_root_add() in my tree. > > > > > > What kind of problems? If CONFIG_HOTPLUG is enabled __devinit defines > > > away to nothing, so this shouldn't have broken anything. > > > > It did, because there's a dependency on PCI, so I would need to merge > > the PCI patch along with the ACPI one, but I couldn't find the PCI > > one, so I dropped the ACPI one too. > > Ah, ok, that makes sense. I will be including the PCI ones in my tree > soon, once I get Bjorn's ack. So perhaps you can take this one too? :-) Please regard it as acked. Thanks, Rafael
On Wed, Nov 28, 2012 at 09:08:56PM +0100, Rafael J. Wysocki wrote: > On Wednesday, November 28, 2012 11:38:24 AM Greg KH wrote: > > On Wed, Nov 28, 2012 at 08:34:43PM +0100, Rafael J. Wysocki wrote: > > > On Wednesday, November 28, 2012 11:00:02 AM Greg KH wrote: > > > > On Thu, Nov 22, 2012 at 01:18:09AM +0100, Rafael J. Wysocki wrote: > > > > > On Wednesday, November 21, 2012 01:46:36 AM Rafael J. Wysocki wrote: > > > > > > On Monday, November 19, 2012 01:22:46 PM Bill Pemberton wrote: > > > > > > > CONFIG_HOTPLUG is going away as an option so __devinit is no longer > > > > > > > needed. > > > > > > > > > > > > Applied to the linux-next branch of the linux-pm.git tree as v3.8 material. > > > > > > > > > > And dropped, because it causes build problems to happen in > > > > > acpi_pci_root_add() in my tree. > > > > > > > > What kind of problems? If CONFIG_HOTPLUG is enabled __devinit defines > > > > away to nothing, so this shouldn't have broken anything. > > > > > > It did, because there's a dependency on PCI, so I would need to merge > > > the PCI patch along with the ACPI one, but I couldn't find the PCI > > > one, so I dropped the ACPI one too. > > > > Ah, ok, that makes sense. I will be including the PCI ones in my tree > > soon, once I get Bjorn's ack. > > So perhaps you can take this one too? :-) I will be glad to do so. > Please regard it as acked. Thanks, will do. greg k-h -- 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
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 1599566..73bca11 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -901,7 +901,7 @@ static unsigned long ghes_esource_prealloc_size( return prealloc_size; } -static int __devinit ghes_probe(struct platform_device *ghes_dev) +static int ghes_probe(struct platform_device *ghes_dev) { struct acpi_hest_generic *generic; struct ghes *ghes = NULL; diff --git a/drivers/acpi/hed.c b/drivers/acpi/hed.c index 20a0f2c..0ec28a3 100644 --- a/drivers/acpi/hed.c +++ b/drivers/acpi/hed.c @@ -61,7 +61,7 @@ static void acpi_hed_notify(struct acpi_device *device, u32 event) blocking_notifier_call_chain(&acpi_hed_notify_list, 0, NULL); } -static int __devinit acpi_hed_add(struct acpi_device *device) +static int acpi_hed_add(struct acpi_device *device) { /* Only one hardware error device */ if (hed_handle) diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index ab781f0..7928d4d 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c @@ -445,7 +445,7 @@ out: } EXPORT_SYMBOL(acpi_pci_osc_control_set); -static int __devinit acpi_pci_root_add(struct acpi_device *device) +static int acpi_pci_root_add(struct acpi_device *device) { unsigned long long segment, bus; acpi_status status;
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: linux-acpi@vger.kernel.org --- drivers/acpi/apei/ghes.c | 2 +- drivers/acpi/hed.c | 2 +- drivers/acpi/pci_root.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)