Commit 2c70f022 authored Oct 27, 2010 by Alexandre Bounine Committed by Linus Torvalds Oct 27, 2010

rapidio: fix RapidIO sysfs hierarchy



This set of RapidIO patches extends support for standard error recovery
mechanism and adds new IDT Gen2 sRIO switch devices - CPS-1848 and
CPS-1616.  Implementation of the standard error-stopped state recovery
mechanism (as defined by the RapidIO specification) is required for the
new switches.

Version 2 of this set of patches addresses received comments and fixes an
error notification setup issue found in the idt_gen2.c after the first
version was released.

This patch:

Make RapidIO devices appear in /sys/devices/rapidio directory instead of
top of /sys/devices directory.

Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: Thomas Moll <thomas.moll@sysgo.com>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Li Yang <leoli@freescale.com>
Cc: Kumar Gala <galak@kernel.crashing.org>
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>

parent e89d67cf

drivers/rapidio/rio-driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ static int rio_match_bus(struct device dev, struct device_driver drv)
		out:return 0;
		}

		static struct device rio_bus = {
		struct device rio_bus = {
		.init_name = "rapidio",
		};

drivers/rapidio/rio-scan.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -478,6 +478,7 @@ static struct rio_dev __devinit rio_setup_device(struct rio_net net,
		}

		rdev->dev.bus = &rio_bus_type;
		rdev->dev.parent = &rio_bus;

		device_initialize(&rdev->dev);
		rdev->dev.release = rio_release_dev;

include/linux/rio.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,7 @@
		#define RIO_PW_MSG_SIZE 64

		extern struct bus_type rio_bus_type;
		extern struct device rio_bus;
		extern struct list_head rio_devices; /* list of all devices */

		struct rio_mport;

Admin message