Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / rapidio / rio-scan.c

diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
index 764dc5fd30b2342f3072dc300b9c37d3590128aa..a63a380809d14c7ffaa6be198c0747f9b648193e 100644 (file)
--- a/drivers/rapidio/rio-scan.c
+++ b/drivers/rapidio/rio-scan.c
@@ -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
@@ -986,17 +973,6 @@ static void rio_init_em(struct rio_dev *rdev)
        }
 }
 
-/**
- * rio_pw_enable - Enables/disables port-write handling by a master port
- * @port: Master port associated with port-write handling
- * @enable:  1=enable,  0=disable
- */
-static void rio_pw_enable(struct rio_mport *port, int enable)
-{
-       if (port->ops->pwenable)
-               port->ops->pwenable(port, enable);
-}
-
 /**
  * rio_enum_mport- Start enumeration through a master port
  * @mport: Master port to send transactions