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

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

POWERPC: drivers: 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, __devexit_p, __devinitdata,
__devinitconst, 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: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c9503b8

arch/powerpc/include/asm/eeh.h

+3 −3
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static inline void eeh_unlock(void) 
#define EEH_MAX_ALLOWED_FREEZES 5



typedef void *(*eeh_traverse_func)(void *data, void *flag);

int __devinit eeh_phb_pe_create(struct pci_controller *phb);

int eeh_phb_pe_create(struct pci_controller *phb);

int eeh_add_to_parent_pe(struct eeh_dev *edev);

int eeh_rmv_from_parent_pe(struct eeh_dev *edev, int purge_pe);

void *eeh_pe_dev_traverse(struct eeh_pe *root,
@@ -191,8 +191,8 @@ void *eeh_pe_dev_traverse(struct eeh_pe *root, 
void eeh_pe_restore_bars(struct eeh_pe *pe);

struct pci_bus *eeh_pe_bus_get(struct eeh_pe *pe);



void * __devinit eeh_dev_init(struct device_node *dn, void *data);

void __devinit eeh_dev_phb_init_dynamic(struct pci_controller *phb);

void *eeh_dev_init(struct device_node *dn, void *data);

void eeh_dev_phb_init_dynamic(struct pci_controller *phb);

int __init eeh_ops_register(struct eeh_ops *ops);

int __exit eeh_ops_unregister(const char *name);

unsigned long eeh_check_failure(const volatile void __iomem *token,

arch/powerpc/include/asm/io-workarounds.h

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ struct iowa_bus { 
	void   *private;

};



void __devinit iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,

void iowa_register_bus(struct pci_controller *, struct ppc_pci_io *,

		       int (*)(struct iowa_bus *, void *), void *);

struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR);

struct iowa_bus *iowa_pio_find_bus(unsigned long);

arch/powerpc/include/asm/parport.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 


#include <asm/prom.h>



static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)

static int parport_pc_find_nonpci_ports (int autoirq, int autodma)

{

	struct device_node *np;

	const u32 *prop;

arch/powerpc/include/asm/smp.h

+2 −2
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ struct smp_ops_t { 


extern void smp_send_debugger_break(void);

extern void start_secondary_resume(void);

extern void __devinit smp_generic_give_timebase(void);

extern void __devinit smp_generic_take_timebase(void);

extern void smp_generic_give_timebase(void);

extern void smp_generic_take_timebase(void);



DECLARE_PER_CPU(unsigned int, cpu_pvr);

arch/powerpc/include/asm/vio.h

+1 −1
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ extern void vio_unregister_driver(struct vio_driver *drv); 
extern int vio_cmo_entitlement_update(size_t);

extern void vio_cmo_set_dev_desired(struct vio_dev *viodev, size_t desired);



extern void __devinit vio_unregister_device(struct vio_dev *dev);

extern void vio_unregister_device(struct vio_dev *dev);



extern int vio_h_cop_sync(struct vio_dev *vdev, struct vio_pfo_op *op);