rapidio: integrate rio_switch into rio_dev

Convert RIO switches device structures (rio_dev + rio_switch) into a
single allocation unit.

This change is based on the fact that RIO switches are using common RIO
device objects anyway.  Allocating RIO switch objects as RIO devices with
added space for switch information simplifies handling of RIO switch
devices.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Micha Nelissen <micha@neli.hopto.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c
index 137ed93ee33f..76b41853a877 100644
--- a/drivers/rapidio/rio-sysfs.c
+++ b/drivers/rapidio/rio-sysfs.c
@@ -217,7 +217,7 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
 
         err = device_create_bin_file(&rdev->dev, &rio_config_attr);
 
-        if (!err && rdev->rswitch) {
+        if (!err && (rdev->pef & RIO_PEF_SWITCH)) {
                 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);
@@ -239,7 +239,7 @@ int rio_create_sysfs_dev_files(struct rio_dev *rdev)
 void rio_remove_sysfs_dev_files(struct rio_dev *rdev)
 {
         device_remove_bin_file(&rdev->dev, &rio_config_attr);
-        if (rdev->rswitch) {
+        if (rdev->pef & RIO_PEF_SWITCH) {
                 device_remove_file(&rdev->dev, &dev_attr_routes);
                 if (rdev->rswitch->sw_sysfs)
                         rdev->rswitch->sw_sysfs(rdev, RIO_SW_SYSFS_REMOVE);