usb: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Peter Korsgaard <jacmet@sunsite.dk> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Acked-by: Felipe Balbi <balbi@ti.com> Cc: Li Yang <leoli@freescale.com> Acked-by: Alan Stern <stern@rowland.harvard.edu> Cc: Geoff Levand <geoff@infradead.org> Cc: Wan ZongShun <mcuos.com@gmail.com> Cc: Olav Kongas <ok@artecdesign.ee> Cc: Lennert Buytenhek <kernel@wantstofly.org> Cc: Ben Dooks <ben-linux@fluff.org> Cc: Kukjin Kim <kgene.kim@samsung.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:

committato da
Greg Kroah-Hartman

parent
7690417db5
commit
41ac7b3ab7
@@ -443,7 +443,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask)
|
||||
#define pio_enabled(dev) io_type_enabled(dev, PCI_COMMAND_IO)
|
||||
#define mmio_enabled(dev) io_type_enabled(dev, PCI_COMMAND_MEMORY)
|
||||
|
||||
static void __devinit quirk_usb_handoff_uhci(struct pci_dev *pdev)
|
||||
static void quirk_usb_handoff_uhci(struct pci_dev *pdev)
|
||||
{
|
||||
unsigned long base = 0;
|
||||
int i;
|
||||
@@ -461,12 +461,12 @@ static void __devinit quirk_usb_handoff_uhci(struct pci_dev *pdev)
|
||||
uhci_check_and_reset_hc(pdev, base);
|
||||
}
|
||||
|
||||
static int __devinit mmio_resource_enabled(struct pci_dev *pdev, int idx)
|
||||
static int mmio_resource_enabled(struct pci_dev *pdev, int idx)
|
||||
{
|
||||
return pci_resource_start(pdev, idx) && mmio_enabled(pdev);
|
||||
}
|
||||
|
||||
static void __devinit quirk_usb_handoff_ohci(struct pci_dev *pdev)
|
||||
static void quirk_usb_handoff_ohci(struct pci_dev *pdev)
|
||||
{
|
||||
void __iomem *base;
|
||||
u32 control;
|
||||
@@ -558,7 +558,7 @@ static const struct dmi_system_id __devinitconst ehci_dmi_nohandoff_table[] = {
|
||||
{ }
|
||||
};
|
||||
|
||||
static void __devinit ehci_bios_handoff(struct pci_dev *pdev,
|
||||
static void ehci_bios_handoff(struct pci_dev *pdev,
|
||||
void __iomem *op_reg_base,
|
||||
u32 cap, u8 offset)
|
||||
{
|
||||
@@ -626,7 +626,7 @@ static void __devinit ehci_bios_handoff(struct pci_dev *pdev,
|
||||
writel(0, op_reg_base + EHCI_CONFIGFLAG);
|
||||
}
|
||||
|
||||
static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
|
||||
static void quirk_usb_disable_ehci(struct pci_dev *pdev)
|
||||
{
|
||||
void __iomem *base, *op_reg_base;
|
||||
u32 hcc_params, cap, val;
|
||||
@@ -841,7 +841,7 @@ EXPORT_SYMBOL_GPL(usb_disable_xhci_ports);
|
||||
* and then waits 5 seconds for the BIOS to hand over control.
|
||||
* If we timeout, assume the BIOS is broken and take control anyway.
|
||||
*/
|
||||
static void __devinit quirk_usb_handoff_xhci(struct pci_dev *pdev)
|
||||
static void quirk_usb_handoff_xhci(struct pci_dev *pdev)
|
||||
{
|
||||
void __iomem *base;
|
||||
int ext_cap_offset;
|
||||
@@ -941,7 +941,7 @@ hc_init:
|
||||
iounmap(base);
|
||||
}
|
||||
|
||||
static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
|
||||
static void quirk_usb_early_handoff(struct pci_dev *pdev)
|
||||
{
|
||||
/* Skip Netlogic mips SoC's internal PCI USB controller.
|
||||
* This device does not need/support EHCI/OHCI handoff
|
||||
|
Fai riferimento in un nuovo problema
Block a user