Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Alexandre Bounine and committed by
Linus Torvalds
2c70f022 e89d67cf

+3 -1
+1 -1
drivers/rapidio/rio-driver.c
··· 192 192 out:return 0; 193 193 } 194 194 195 - static struct device rio_bus = { 195 + struct device rio_bus = { 196 196 .init_name = "rapidio", 197 197 }; 198 198
+1
drivers/rapidio/rio-scan.c
··· 478 478 } 479 479 480 480 rdev->dev.bus = &rio_bus_type; 481 + rdev->dev.parent = &rio_bus; 481 482 482 483 device_initialize(&rdev->dev); 483 484 rdev->dev.release = rio_release_dev;
+1
include/linux/rio.h
··· 67 67 #define RIO_PW_MSG_SIZE 64 68 68 69 69 extern struct bus_type rio_bus_type; 70 + extern struct device rio_bus; 70 71 extern struct list_head rio_devices; /* list of all devices */ 71 72 72 73 struct rio_mport;