2 files changed, 25 insertions, 7 deletions

diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 00b475658356..137ed93ee33f 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -40,9 +40,6 @@ static ssize_t routes_show(struct device *dev, struct device_attribute *attr, ch
         char *str = buf;
         int i;
 
-        if (!rdev->rswitch)
-                goto out;
-
         for (i = 0; i < RIO_MAX_ROUTE_ENTRIES(rdev->net->hport->sys_size);
                         i++) {
                 if (rdev->rswitch->route_table[i] == RIO_INVALID_ROUTE)
@@ -52,7 +49,6 @@ static ssize_t routes_show(struct device *dev, struct device_attribute *attr, ch
                             rdev->rswitch->route_table[i]);
         }
 
-      out:
         return (str - buf);
 }
 
@@ -63,10 +59,11 @@ struct device_attribute rio_dev_attrs[] = {
         __ATTR_RO(asm_did),
         __ATTR_RO(asm_vid),
         __ATTR_RO(asm_rev),
-        __ATTR_RO(routes),
         __ATTR_NULL,
 };
 
+static DEVICE_ATTR(routes, S_IRUGO, routes_show, NULL);
+
 static ssize_t
 rio_read_config(struct file *filp, struct kobject *kobj,
                 struct bin_attribute *bin_attr,
@@ -218,7 +215,17 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
 {
         int err = 0;
 
-        err = sysfs_create_bin_file(&rdev->dev.kobj, &rio_config_attr);
+        err = device_create_bin_file(&rdev->dev, &rio_config_attr);
+
+        if (!err && rdev->rswitch) {
+                err = device_create_file(&rdev->dev, &dev_attr_routes);
+                if (!err && rdev->rswitch->sw_sysfs)
+                        err = rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_CREATE);
+        }
+
+        if (err)
+                pr_warning("RIO: Failed to create attribute file(s) for %s\n",
+                           rio_name(rdev));
 
         return err;
 }
@@ -231,5 +238,10 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
  */
 void rio_remove_sysfs_dev_files(struct rio_dev *rdev)
 {
-        sysfs_remove_bin_file(&rdev->dev.kobj, &rio_config_attr);
+        device_remove_bin_file(&rdev->dev, &rio_config_attr);
+        if (rdev->rswitch) {
+                device_remove_file(&rdev->dev, &dev_attr_routes);
+                if (rdev->rswitch->sw_sysfs)
+                        rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_REMOVE);
+        }
 }
diff --git a/include/linux/rio.h b/include/linux/rio.h
index 8d9e66dc7969..4fa5e3d2b117 100644
--- a/include/linux/rio.h
+++ b/include/linux/rio.h
@@ -218,6 +218,10 @@ struct rio_net {
         unsigned char id;       /* RIO network ID */
 };
 
+/* Definitions used by switch sysfs initialization callback */
+#define RIO_SW_SYSFS_CREATE     1       /* Create switch attributes */
+#define RIO_SW_SYSFS_REMOVE     0       /* Remove switch attributes */
+
 /**
  * struct rio_switch - RIO switch info
  * @node: Node in global list of switches
@@ -234,6 +238,7 @@ struct rio_net {
  * @get_domain: Callback for switch-specific domain get function
  * @em_init: Callback for switch-specific error management initialization function
  * @em_handle: Callback for switch-specific error management handler function
+ * @sw_sysfs: Callback that initializes switch-specific sysfs attributes
  * @nextdev: Array of per-port pointers to the next attached device
  */
 struct rio_switch {
@@ -256,6 +261,7 @@ struct rio_switch {
                            u8 *sw_domain);
         int (*em_init) (struct rio_dev *dev);
         int (*em_handle) (struct rio_dev *dev, u8 swport);
+        int (*sw_sysfs) (struct rio_dev *dev, int create);
         struct rio_dev *nextdev[0];
 };