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

Commit 5024622f authored by Alexandre Bounine's avatar Alexandre Bounine Committed by Linus Torvalds
Browse files

rapidio: move rio_local_set_device_id function to the common core 



Make function rio_local_set_device_id() common for all components of
RapidIO subsystem.

Signed-off-by: default avatarAlexandre Bounine <alexandre.bounine@idt.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a7b4c636

drivers/rapidio/rio-scan.c

+0 −13
Original line number Diff line number Diff line
@@ -193,19 +193,6 @@ static void rio_set_device_id(struct rio_mport *port, u16 destid, u8 hopcount, u 
				  RIO_SET_DID(port->sys_size, did));

}



/**

 * rio_local_set_device_id - Set the base/extended device id for a port

 * @port: RIO master port

 * @did: Device ID value to be written

 *

 * Writes the base/extended device id from a device.

 */

static void rio_local_set_device_id(struct rio_mport *port, u16 did)

{

	rio_local_write_config_32(port, RIO_DID_CSR, RIO_SET_DID(port->sys_size,

				did));

}



/**

 * rio_clear_locks- Release all host locks and signal enumeration complete

 * @net: RIO network to run on

drivers/rapidio/rio.c

+14 −0
Original line number Diff line number Diff line
@@ -137,6 +137,20 @@ void rio_free_net(struct rio_net *net) 
}

EXPORT_SYMBOL_GPL(rio_free_net);



/**

 * rio_local_set_device_id - Set the base/extended device id for a port

 * @port: RIO master port

 * @did: Device ID value to be written

 *

 * Writes the base/extended device id from a device.

 */

void rio_local_set_device_id(struct rio_mport *port, u16 did)

{

	rio_local_write_config_32(port, RIO_DID_CSR,

				  RIO_SET_DID(port->sys_size, did));

}

EXPORT_SYMBOL_GPL(rio_local_set_device_id);



/**

 * rio_add_device- Adds a RIO device to the device model

 * @rdev: RIO device

include/linux/rio_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -435,6 +435,7 @@ static inline void rio_set_drvdata(struct rio_dev *rdev, void *data) 


/* Misc driver helpers */

extern u16 rio_local_get_device_id(struct rio_mport *port);

extern void rio_local_set_device_id(struct rio_mport *port, u16 did);

extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from);

extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_did,

				   struct rio_dev *from);