Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...

[pandora-kernel.git] / drivers / rapidio / rio-sysfs.c

diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 00b4756..137ed93 100644 (file)
--- 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);
+       }
 }