diff options
| author | Alexandre Bounine <alexandre.bounine@idt.com> | 2016-03-22 14:26:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-22 15:36:02 -0700 |
| commit | 5024622f583eb242ed8040d0b9d1e0d2458d1db8 (patch) | |
| tree | dcfb1c09c13adaa0dc188667fa6169791e3ab72c | |
| parent | a7b4c636d83034f0e89d58651ef2e9b96564489a (diff) | |
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: Alexandre 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | drivers/rapidio/rio-scan.c | 13 | ||||
| -rw-r--r-- | drivers/rapidio/rio.c | 14 | ||||
| -rw-r--r-- | include/linux/rio_drv.h | 1 |
3 files changed, 15 insertions, 13 deletions
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index 764dc5fd30b2..f730914f6ff6 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c @@ -194,19 +194,6 @@ static void rio_set_device_id(struct rio_mport *port, u16 destid, u8 hopcount, u } /** - * 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 * diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index e42f97e9e62a..095801c4d239 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c @@ -138,6 +138,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 * diff --git a/include/linux/rio_drv.h b/include/linux/rio_drv.h index 9fc2f213e74f..341b3bf78333 100644 --- a/include/linux/rio_drv.h +++ b/include/linux/rio_drv.h @@ -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); |