Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 163247c1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Drivers: ssb: remove __dev* attributes. 



CONFIG_HOTPLUG is going away as an option.  As a result, the __dev*
markings need to be removed.

This change removes the use of __devinit, and __devexit from these
drivers.

Based on patches originally written by Bill Pemberton, but redone by me
in order to handle some of the coding style issues better, by hand.

Cc: Bill Pemberton <wfp5p@virginia.edu>
Cc: Michael Buesch <m@bues.ch>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4bf27b8b

drivers/ssb/driver_gige.c

+6 −8
Original line number Diff line number Diff line
@@ -107,9 +107,8 @@ void gige_pcicfg_write32(struct ssb_gige *dev, 
	gige_write32(dev, SSB_GIGE_PCICFG + offset, value);

}



static int __devinit ssb_gige_pci_read_config(struct pci_bus *bus,

					      unsigned int devfn, int reg,

					      int size, u32 *val)

static int ssb_gige_pci_read_config(struct pci_bus *bus, unsigned int devfn,

				    int reg, int size, u32 *val)

{

	struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops);

	unsigned long flags;
@@ -138,9 +137,8 @@ static int __devinit ssb_gige_pci_read_config(struct pci_bus *bus, 
	return PCIBIOS_SUCCESSFUL;

}



static int __devinit ssb_gige_pci_write_config(struct pci_bus *bus,

					       unsigned int devfn, int reg,

					       int size, u32 val)

static int ssb_gige_pci_write_config(struct pci_bus *bus, unsigned int devfn,

				     int reg, int size, u32 val)

{

	struct ssb_gige *dev = container_of(bus->ops, struct ssb_gige, pci_ops);

	unsigned long flags;
@@ -169,7 +167,7 @@ static int __devinit ssb_gige_pci_write_config(struct pci_bus *bus, 
	return PCIBIOS_SUCCESSFUL;

}



static int __devinit ssb_gige_probe(struct ssb_device *sdev,

static int ssb_gige_probe(struct ssb_device *sdev,

			  const struct ssb_device_id *id)

{

	struct ssb_gige *dev;

drivers/ssb/driver_pcicore.c

+5 −5
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ int ssb_pcicore_pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) 
	return ssb_mips_irq(extpci_core->dev) + 2;

}



static void __devinit ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)

static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)

{

	u32 val;
@@ -380,7 +380,7 @@ static void __devinit ssb_pcicore_init_hostmode(struct ssb_pcicore *pc) 
	register_pci_controller(&ssb_pcicore_controller);

}



static int __devinit pcicore_is_in_hostmode(struct ssb_pcicore *pc)

static int pcicore_is_in_hostmode(struct ssb_pcicore *pc)

{

	struct ssb_bus *bus = pc->dev->bus;

	u16 chipid_top;
@@ -413,7 +413,7 @@ static int __devinit pcicore_is_in_hostmode(struct ssb_pcicore *pc) 
 * Workarounds.

 **************************************************/



static void __devinit ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc)

static void ssb_pcicore_fix_sprom_core_index(struct ssb_pcicore *pc)

{

	u16 tmp = pcicore_read16(pc, SSB_PCICORE_SPROM(0));

	if (((tmp & 0xF000) >> 12) != pc->dev->core_index) {
@@ -515,7 +515,7 @@ static void ssb_pcicore_pcie_setup_workarounds(struct ssb_pcicore *pc) 
 * Generic and Clientmode operation code.

 **************************************************/



static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)

static void ssb_pcicore_init_clientmode(struct ssb_pcicore *pc)

{

	struct ssb_device *pdev = pc->dev;

	struct ssb_bus *bus = pdev->bus;
@@ -534,7 +534,7 @@ static void __devinit ssb_pcicore_init_clientmode(struct ssb_pcicore *pc) 
	}

}



void __devinit ssb_pcicore_init(struct ssb_pcicore *pc)

void ssb_pcicore_init(struct ssb_pcicore *pc)

{

	struct ssb_device *dev = pc->dev;

drivers/ssb/main.c

+12 −15
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static int ssb_devices_register(struct ssb_bus *bus) 
}



/* Needs ssb_buses_lock() */

static int __devinit ssb_attach_queued_buses(void)

static int ssb_attach_queued_buses(void)

{

	struct ssb_bus *bus, *n;

	int err = 0;
@@ -761,7 +761,7 @@ static int ssb_fetch_invariants(struct ssb_bus *bus, 
	return err;

}



static int __devinit ssb_bus_register(struct ssb_bus *bus,

static int ssb_bus_register(struct ssb_bus *bus,

			    ssb_invariants_func_t get_invariants,

			    unsigned long baseaddr)

{
@@ -851,8 +851,7 @@ static int __devinit ssb_bus_register(struct ssb_bus *bus, 
}



#ifdef CONFIG_SSB_PCIHOST

int __devinit ssb_bus_pcibus_register(struct ssb_bus *bus,

				      struct pci_dev *host_pci)

int ssb_bus_pcibus_register(struct ssb_bus *bus, struct pci_dev *host_pci)

{

	int err;
@@ -875,7 +874,7 @@ EXPORT_SYMBOL(ssb_bus_pcibus_register); 
#endif /* CONFIG_SSB_PCIHOST */



#ifdef CONFIG_SSB_PCMCIAHOST

int __devinit ssb_bus_pcmciabus_register(struct ssb_bus *bus,

int ssb_bus_pcmciabus_register(struct ssb_bus *bus,

			       struct pcmcia_device *pcmcia_dev,

			       unsigned long baseaddr)

{
@@ -897,8 +896,7 @@ EXPORT_SYMBOL(ssb_bus_pcmciabus_register); 
#endif /* CONFIG_SSB_PCMCIAHOST */



#ifdef CONFIG_SSB_SDIOHOST

int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus,

				       struct sdio_func *func,

int ssb_bus_sdiobus_register(struct ssb_bus *bus, struct sdio_func *func,

			     unsigned int quirks)

{

	int err;
@@ -919,8 +917,7 @@ int __devinit ssb_bus_sdiobus_register(struct ssb_bus *bus, 
EXPORT_SYMBOL(ssb_bus_sdiobus_register);

#endif /* CONFIG_SSB_PCMCIAHOST */



int __devinit ssb_bus_ssbbus_register(struct ssb_bus *bus,

				      unsigned long baseaddr,

int ssb_bus_ssbbus_register(struct ssb_bus *bus, unsigned long baseaddr,

			    ssb_invariants_func_t get_invariants)

{

	int err;

drivers/ssb/pcihost_wrapper.c

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int ssb_pcihost_resume(struct pci_dev *dev) 
# define ssb_pcihost_resume	NULL

#endif /* CONFIG_PM */



static int __devinit ssb_pcihost_probe(struct pci_dev *dev,

static int ssb_pcihost_probe(struct pci_dev *dev,

			     const struct pci_device_id *id)

{

	struct ssb_bus *ssb;
@@ -111,7 +111,7 @@ static void ssb_pcihost_remove(struct pci_dev *dev) 
	pci_set_drvdata(dev, NULL);

}



int __devinit ssb_pcihost_register(struct pci_driver *driver)

int ssb_pcihost_register(struct pci_driver *driver)

{

	driver->probe = ssb_pcihost_probe;

	driver->remove = ssb_pcihost_remove;