| Message ID | 1305869761-27460-1-git-send-email-gong.chen@linux.intel.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Friday, May 20, 2011, Chen Gong wrote: > In the commit 28eb5f2, aer_osc_setup is removed but corresponding > definiton information in the aerdrv.h is missed. > > Signed-off-by: Chen Gong <gong.chen@linux.intel.com> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> > --- > drivers/pci/pcie/aer/aerdrv.h | 9 --------- > 1 files changed, 0 insertions(+), 9 deletions(-) > > diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h > index 3eb7708..94a7598 100644 > --- a/drivers/pci/pcie/aer/aerdrv.h > +++ b/drivers/pci/pcie/aer/aerdrv.h > @@ -114,15 +114,6 @@ extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); > extern void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info); > extern irqreturn_t aer_irq(int irq, void *context); > > -#ifdef CONFIG_ACPI > -extern int aer_osc_setup(struct pcie_device *pciedev); > -#else > -static inline int aer_osc_setup(struct pcie_device *pciedev) > -{ > - return 0; > -} > -#endif > - > #ifdef CONFIG_ACPI_APEI > extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); > #else > -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 20 May 2011 20:58:53 +0200 "Rafael J. Wysocki" <rjw@sisk.pl> wrote: > On Friday, May 20, 2011, Chen Gong wrote: > > In the commit 28eb5f2, aer_osc_setup is removed but corresponding > > definiton information in the aerdrv.h is missed. > > > > Signed-off-by: Chen Gong <gong.chen@linux.intel.com> > > Acked-by: Rafael J. Wysocki <rjw@sisk.pl> > > > --- > > drivers/pci/pcie/aer/aerdrv.h | 9 --------- > > 1 files changed, 0 insertions(+), 9 deletions(-) > > > > diff --git a/drivers/pci/pcie/aer/aerdrv.h > > b/drivers/pci/pcie/aer/aerdrv.h index 3eb7708..94a7598 100644 > > --- a/drivers/pci/pcie/aer/aerdrv.h > > +++ b/drivers/pci/pcie/aer/aerdrv.h > > @@ -114,15 +114,6 @@ extern void aer_print_error(struct pci_dev > > *dev, struct aer_err_info *info); extern void > > aer_print_port_info(struct pci_dev *dev, struct aer_err_info > > *info); extern irqreturn_t aer_irq(int irq, void *context); > > -#ifdef CONFIG_ACPI > > -extern int aer_osc_setup(struct pcie_device *pciedev); > > -#else > > -static inline int aer_osc_setup(struct pcie_device *pciedev) > > -{ > > - return 0; > > -} > > -#endif > > - > > #ifdef CONFIG_ACPI_APEI > > extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); > > #else > > > > Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-pci" 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/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h index 3eb7708..94a7598 100644 --- a/drivers/pci/pcie/aer/aerdrv.h +++ b/drivers/pci/pcie/aer/aerdrv.h @@ -114,15 +114,6 @@ extern void aer_print_error(struct pci_dev *dev, struct aer_err_info *info); extern void aer_print_port_info(struct pci_dev *dev, struct aer_err_info *info); extern irqreturn_t aer_irq(int irq, void *context); -#ifdef CONFIG_ACPI -extern int aer_osc_setup(struct pcie_device *pciedev); -#else -static inline int aer_osc_setup(struct pcie_device *pciedev) -{ - return 0; -} -#endif - #ifdef CONFIG_ACPI_APEI extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev); #else
In the commit 28eb5f2, aer_osc_setup is removed but corresponding definiton information in the aerdrv.h is missed. Signed-off-by: Chen Gong <gong.chen@linux.intel.com> --- drivers/pci/pcie/aer/aerdrv.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-)