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

Commit 305c891e authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

rapidio: remove use of __devinit 



CONFIG_HOTPLUG is going away as an option so __devinit is no longer
needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Cc: Matt Porter <mporter@kernel.crashing.org>
Acked-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e765a02c

drivers/rapidio/devices/tsi721.c

+2 −2
Original line number Diff line number Diff line
@@ -2202,7 +2202,7 @@ static void tsi721_disable_ints(struct tsi721_device *priv) 
 *

 * Configures Tsi721 as RapidIO master port.

 */

static int __devinit tsi721_setup_mport(struct tsi721_device *priv)

static int tsi721_setup_mport(struct tsi721_device *priv)

{

	struct pci_dev *pdev = priv->pdev;

	int err = 0;
@@ -2302,7 +2302,7 @@ static int __devinit tsi721_setup_mport(struct tsi721_device *priv) 
	return err;

}



static int __devinit tsi721_probe(struct pci_dev *pdev,

static int tsi721_probe(struct pci_dev *pdev,

				  const struct pci_device_id *id)

{

	struct tsi721_device *priv;

drivers/rapidio/devices/tsi721.h

+1 −1
Original line number Diff line number Diff line
@@ -846,7 +846,7 @@ struct tsi721_device { 


#ifdef CONFIG_RAPIDIO_DMA_ENGINE

extern void tsi721_bdma_handler(struct tsi721_bdma_chan *bdma_chan);

extern int __devinit tsi721_register_dma(struct tsi721_device *priv);

extern int tsi721_register_dma(struct tsi721_device *priv);

#endif



#endif

drivers/rapidio/devices/tsi721_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -765,7 +765,7 @@ static int tsi721_device_control(struct dma_chan *dchan, enum dma_ctrl_cmd cmd, 
	return 0;

}



int __devinit tsi721_register_dma(struct tsi721_device *priv)

int tsi721_register_dma(struct tsi721_device *priv)

{

	int i;

	int nr_channels = TSI721_DMA_MAXCH;

drivers/rapidio/rio-scan.c

+7 −7
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static void rio_switch_init(struct rio_dev *rdev, int do_enum) 
 * device to the RIO device list.  Creates the generic sysfs nodes

 * for an RIO device.

 */

static int __devinit rio_add_device(struct rio_dev *rdev)

static int rio_add_device(struct rio_dev *rdev)

{

	int err;
@@ -463,7 +463,7 @@ inline int rio_enable_rx_tx_port(struct rio_mport *port, 
 * to a RIO device on success or NULL on failure.

 *

 */

static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,

static struct rio_dev *rio_setup_device(struct rio_net *net,

					struct rio_mport *port, u16 destid,

					u8 hopcount, int do_enum)

{
@@ -837,7 +837,7 @@ static u16 rio_get_host_deviceid_lock(struct rio_mport *port, u8 hopcount) 
 * Recursively enumerates a RIO network.  Transactions are sent via the

 * master port passed in @port.

 */

static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,

static int rio_enum_peer(struct rio_net *net, struct rio_mport *port,

			 u8 hopcount, struct rio_dev *prev, int prev_port)

{

	struct rio_dev *rdev;
@@ -1044,7 +1044,7 @@ static int rio_enum_complete(struct rio_mport *port) 
 * Recursively discovers a RIO network.  Transactions are sent via the

 * master port passed in @port.

 */

static int __devinit

static int

rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,

	      u8 hopcount, struct rio_dev *prev, int prev_port)

{
@@ -1151,7 +1151,7 @@ static int rio_mport_is_active(struct rio_mport *port) 
 * network list of associated master ports. Returns a

 * RIO network pointer on success or %NULL on failure.

 */

static struct rio_net __devinit *rio_alloc_net(struct rio_mport *port,

static struct rio_net *rio_alloc_net(struct rio_mport *port,

					       int do_enum, u16 start)

{

	struct rio_net *net;
@@ -1266,7 +1266,7 @@ static void rio_pw_enable(struct rio_mport *port, int enable) 
 * link, then start recursive peer enumeration. Returns %0 if

 * enumeration succeeds or %-EBUSY if enumeration fails.

 */

int __devinit rio_enum_mport(struct rio_mport *mport)

int rio_enum_mport(struct rio_mport *mport)

{

	struct rio_net *net = NULL;

	int rc = 0;
@@ -1369,7 +1369,7 @@ static void rio_build_route_tables(struct rio_net *net) 
 * peer discovery. Returns %0 if discovery succeeds or %-EBUSY

 * on failure.

 */

int __devinit rio_disc_mport(struct rio_mport *mport)

int rio_disc_mport(struct rio_mport *mport)

{

	struct rio_net *net = NULL;

	unsigned long to_end;

drivers/rapidio/rio.c

+3 −3
Original line number Diff line number Diff line
@@ -1250,7 +1250,7 @@ static void rio_fixup_device(struct rio_dev *dev) 
{

}



static int __devinit rio_init(void)

static int rio_init(void)

{

	struct rio_dev *dev = NULL;
@@ -1267,7 +1267,7 @@ struct rio_disc_work { 
	struct rio_mport	*mport;

};



static void __devinit disc_work_handler(struct work_struct *_work)

static void disc_work_handler(struct work_struct *_work)

{

	struct rio_disc_work *work;
@@ -1277,7 +1277,7 @@ static void __devinit disc_work_handler(struct work_struct *_work) 
	rio_disc_mport(work->mport);

}



int __devinit rio_init_mports(void)

int rio_init_mports(void)

{

	struct rio_mport *port;

	struct rio_disc_work *work;