rapidio: move rio_local_set_device_id function to the common core
authorAlexandre Bounine <alexandre.bounine@idt.com>
Tue, 22 Mar 2016 21:26:38 +0000 (14:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Mar 2016 22:36:02 +0000 (15:36 -0700)
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>
drivers/rapidio/rio-scan.c
drivers/rapidio/rio.c
include/linux/rio_drv.h

index 764dc5fd30b2342f3072dc300b9c37d3590128aa..f730914f6ff669477f115d31480cc6fc3010e48b 100644 (file)
@@ -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
index e42f97e9e62a76ed33006919397344c283ff19cf..095801c4d239ac2648474063f6fe3670c8f3f43b 100644 (file)
@@ -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
index 9fc2f213e74fa61d32b3840b5fb202f93f8f525a..341b3bf7833342ab90aeede86b28cf2f71843368 100644 (file)
@@ -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);