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

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

Drivers: infinband: 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,
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: Tom Tucker <tom@opengridcomputing.com>
Cc: Steve Wise <swise@opengridcomputing.com>
Cc: Roland Dreier <roland@kernel.org>
Cc: Sean Hefty <sean.hefty@intel.com>
Cc: Hal Rosenstock <hal.rosenstock@gmail.com>
Cc: Hoang-Nam Nguyen <hnguyen@de.ibm.com>
Cc: Christoph Raisch <raisch@de.ibm.com>
Cc: Mike Marciniszyn <infinipath@intel.com>
Cc: Faisal Latif <faisal.latif@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 27796aa0

drivers/infiniband/hw/amso1100/c2.c

+3 −4
Original line number Diff line number Diff line
@@ -920,8 +920,7 @@ static struct net_device *c2_devinit(struct c2_dev *c2dev, 
	return netdev;

}



static int __devinit c2_probe(struct pci_dev *pcidev,

			      const struct pci_device_id *ent)

static int c2_probe(struct pci_dev *pcidev, const struct pci_device_id *ent)

{

	int ret = 0, i;

	unsigned long reg0_start, reg0_flags, reg0_len;
@@ -1191,7 +1190,7 @@ static int __devinit c2_probe(struct pci_dev *pcidev, 
	return ret;

}



static void __devexit c2_remove(struct pci_dev *pcidev)

static void c2_remove(struct pci_dev *pcidev)

{

	struct c2_dev *c2dev = pci_get_drvdata(pcidev);

	struct net_device *netdev = c2dev->netdev;
@@ -1236,7 +1235,7 @@ static struct pci_driver c2_pci_driver = { 
	.name = DRV_NAME,

	.id_table = c2_pci_table,

	.probe = c2_probe,

	.remove = __devexit_p(c2_remove),

	.remove = c2_remove,

};



static int __init c2_init_module(void)

drivers/infiniband/hw/amso1100/c2.h

+4 −4
Original line number Diff line number Diff line
@@ -498,16 +498,16 @@ extern int c2_post_send(struct ib_qp *ibqp, struct ib_send_wr *ib_wr, 
			struct ib_send_wr **bad_wr);

extern int c2_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *ib_wr,

			   struct ib_recv_wr **bad_wr);

extern void __devinit c2_init_qp_table(struct c2_dev *c2dev);

extern void __devexit c2_cleanup_qp_table(struct c2_dev *c2dev);

extern void c2_init_qp_table(struct c2_dev *c2dev);

extern void c2_cleanup_qp_table(struct c2_dev *c2dev);

extern void c2_set_qp_state(struct c2_qp *, int);

extern struct c2_qp *c2_find_qpn(struct c2_dev *c2dev, int qpn);



/* PDs */

extern int c2_pd_alloc(struct c2_dev *c2dev, int privileged, struct c2_pd *pd);

extern void c2_pd_free(struct c2_dev *c2dev, struct c2_pd *pd);

extern int __devinit c2_init_pd_table(struct c2_dev *c2dev);

extern void __devexit c2_cleanup_pd_table(struct c2_dev *c2dev);

extern int c2_init_pd_table(struct c2_dev *c2dev);

extern void c2_cleanup_pd_table(struct c2_dev *c2dev);



/* CQs */

extern int c2_init_cq(struct c2_dev *c2dev, int entries,

drivers/infiniband/hw/amso1100/c2_pd.c

+2 −2
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ void c2_pd_free(struct c2_dev *c2dev, struct c2_pd *pd) 
	spin_unlock(&c2dev->pd_table.lock);

}



int __devinit c2_init_pd_table(struct c2_dev *c2dev)

int c2_init_pd_table(struct c2_dev *c2dev)

{



	c2dev->pd_table.last = 0;
@@ -84,7 +84,7 @@ int __devinit c2_init_pd_table(struct c2_dev *c2dev) 
	return 0;

}



void __devexit c2_cleanup_pd_table(struct c2_dev *c2dev)

void c2_cleanup_pd_table(struct c2_dev *c2dev)

{

	kfree(c2dev->pd_table.table);

}

drivers/infiniband/hw/amso1100/c2_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -1010,13 +1010,13 @@ out: 
	return err;

}



void __devinit c2_init_qp_table(struct c2_dev *c2dev)

void c2_init_qp_table(struct c2_dev *c2dev)

{

	spin_lock_init(&c2dev->qp_table.lock);

	idr_init(&c2dev->qp_table.idr);

}



void __devexit c2_cleanup_qp_table(struct c2_dev *c2dev)

void c2_cleanup_qp_table(struct c2_dev *c2dev)

{

	idr_destroy(&c2dev->qp_table.idr);

}

drivers/infiniband/hw/amso1100/c2_rnic.c

+2 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static int c2_rnic_close(struct c2_dev *c2dev) 
 * involves initializing the various limits and resource pools that

 * comprise the RNIC instance.

 */

int __devinit c2_rnic_init(struct c2_dev *c2dev)

int c2_rnic_init(struct c2_dev *c2dev)

{

	int err;

	u32 qsize, msgsize;
@@ -611,7 +611,7 @@ int __devinit c2_rnic_init(struct c2_dev *c2dev) 
/*

 * Called by c2_remove to cleanup the RNIC resources.

 */

void __devexit c2_rnic_term(struct c2_dev *c2dev)

void c2_rnic_term(struct c2_dev *c2dev)

{



	/* Close the open adapter instance */