ChangeSet 1.1525.6.5, 2003/07/01 13:30:40-07:00, [EMAIL PROTECTED]
[PATCH] USB: move ohci's sysfs files to the class device instead of the pci device.
drivers/usb/host/ohci-dbg.c | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 deletions(-)
diff -Nru a/drivers/usb/host/ohci-dbg.c b/drivers/usb/host/ohci-dbg.c
--- a/drivers/usb/host/ohci-dbg.c Tue Jul 1 14:22:33 2003
+++ b/drivers/usb/host/ohci-dbg.c Tue Jul 1 14:22:33 2003
@@ -466,13 +466,17 @@
}
static ssize_t
-show_async (struct device *dev, char *buf)
+show_async (struct class_device *class_dev, char *buf)
{
+ struct usb_bus *bus;
+ struct usb_hcd *hcd;
struct ohci_hcd *ohci;
size_t temp;
unsigned long flags;
- ohci = dev_to_ohci(dev);
+ bus = to_usb_bus(class_dev);
+ hcd = bus->hcpriv;
+ ohci = hcd_to_ohci(hcd);
/* display control and bulk lists together, for simplicity */
spin_lock_irqsave (&ohci->lock, flags);
@@ -482,14 +486,16 @@
return temp;
}
-static DEVICE_ATTR (async, S_IRUGO, show_async, NULL);
+static CLASS_DEVICE_ATTR (async, S_IRUGO, show_async, NULL);
#define DBG_SCHED_LIMIT 64
static ssize_t
-show_periodic (struct device *dev, char *buf)
+show_periodic (struct class_device *class_dev, char *buf)
{
+ struct usb_bus *bus;
+ struct usb_hcd *hcd;
struct ohci_hcd *ohci;
struct ed **seen, *ed;
unsigned long flags;
@@ -501,7 +507,9 @@
return 0;
seen_count = 0;
- ohci = dev_to_ohci(dev);
+ bus = to_usb_bus(class_dev);
+ hcd = bus->hcpriv;
+ ohci = hcd_to_ohci(hcd);
next = buf;
size = PAGE_SIZE;
@@ -573,14 +581,16 @@
return PAGE_SIZE - size;
}
-static DEVICE_ATTR (periodic, S_IRUGO, show_periodic, NULL);
+static CLASS_DEVICE_ATTR (periodic, S_IRUGO, show_periodic, NULL);
#undef DBG_SCHED_LIMIT
static ssize_t
-show_registers (struct device *dev, char *buf)
+show_registers (struct class_device *class_dev, char *buf)
{
+ struct usb_bus *bus;
+ struct usb_hcd *hcd;
struct ohci_hcd *ohci;
struct ohci_regs *regs;
unsigned long flags;
@@ -588,7 +598,9 @@
char *next;
u32 rdata;
- ohci = dev_to_ohci(dev);
+ bus = to_usb_bus(class_dev);
+ hcd = bus->hcpriv;
+ ohci = hcd_to_ohci(hcd);
regs = ohci->regs;
next = buf;
size = PAGE_SIZE;
@@ -642,22 +654,22 @@
return PAGE_SIZE - size;
}
-static DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
+static CLASS_DEVICE_ATTR (registers, S_IRUGO, show_registers, NULL);
static inline void create_debug_files (struct ohci_hcd *bus)
{
- device_create_file (bus->hcd.controller, &dev_attr_async);
- device_create_file (bus->hcd.controller, &dev_attr_periodic);
- device_create_file (bus->hcd.controller, &dev_attr_registers);
+ class_device_create_file(&bus->hcd.self.class_dev, &class_device_attr_async);
+ class_device_create_file(&bus->hcd.self.class_dev,
&class_device_attr_periodic);
+ class_device_create_file(&bus->hcd.self.class_dev,
&class_device_attr_registers);
ohci_dbg (bus, "created debug files\n");
}
static inline void remove_debug_files (struct ohci_hcd *bus)
{
- device_remove_file (bus->hcd.controller, &dev_attr_async);
- device_remove_file (bus->hcd.controller, &dev_attr_periodic);
- device_remove_file (bus->hcd.controller, &dev_attr_registers);
+ class_device_remove_file(&bus->hcd.self.class_dev, &class_device_attr_async);
+ class_device_remove_file(&bus->hcd.self.class_dev,
&class_device_attr_periodic);
+ class_device_remove_file(&bus->hcd.self.class_dev,
&class_device_attr_registers);
}
#endif
-------------------------------------------------------
This SF.Net email sponsored by: Free pre-built ASP.NET sites including
Data Reports, E-commerce, Portals, and Forums are available now.
Download today and enter to win an XBOX or Visual Studio .NET.
http://aspnet.click-url.com/go/psa00100006ave/direct;at.asp_061203_01/01
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
