Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 2c70f022e2e1b1493e157dbc3796b1f70a3ff162

Authored by Alexandre Bounine
Committed by Linus Torvalds
1 parent e89d67cfbc
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 3 changed files with 3 additions and 1 deletions Side-by-side Diff

drivers/rapidio/rio-driver.c
Diff comments   View file @ 2c70f02
... ... @@ -192,7 +192,7 @@
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  
drivers/rapidio/rio-scan.c
Diff comments   View file @ 2c70f02
... ... @@ -478,6 +478,7 @@
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;
... ... @@ -67,6 +67,7 @@
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;