The patch titled
usbatm: allow sub-drivers to handle calls to atm_proc_read
has been removed from the -mm tree. Its filename was
usbatm-allow-sub-drivers-to-handle-calls-to-atm_proc_read.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: usbatm: allow sub-drivers to handle calls to atm_proc_read
From: Simon Arlott <simon@xxxxxxxxxx>
usbatm only outputs basic information via the per-device /proc/net/atm/ file,
this patch allows the device specific USB ATM drivers to replace the
atm_proc_read function with their own.
Signed-off-by: Simon Arlott <simon@xxxxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/usb/atm/usbatm.c | 3 +++
drivers/usb/atm/usbatm.h | 3 +++
2 files changed, 6 insertions(+)
diff -puN drivers/usb/atm/usbatm.c~usbatm-allow-sub-drivers-to-handle-calls-to-atm_proc_read drivers/usb/atm/usbatm.c
--- a/drivers/usb/atm/usbatm.c~usbatm-allow-sub-drivers-to-handle-calls-to-atm_proc_read
+++ a/drivers/usb/atm/usbatm.c
@@ -761,6 +761,9 @@ static int usbatm_atm_proc_read(struct a
return -ENODEV;
}
+ if (instance->driver->proc_read != NULL)
+ return instance->driver->proc_read(instance, atm_dev, pos, page);
+
if (!left--)
return sprintf(page, "%s\n", instance->description);
diff -puN drivers/usb/atm/usbatm.h~usbatm-allow-sub-drivers-to-handle-calls-to-atm_proc_read drivers/usb/atm/usbatm.h
--- a/drivers/usb/atm/usbatm.h~usbatm-allow-sub-drivers-to-handle-calls-to-atm_proc_read
+++ a/drivers/usb/atm/usbatm.h
@@ -121,6 +121,9 @@ struct usbatm_driver {
/* cleanup ATM device ... can sleep, but can't fail */
void (*atm_stop) (struct usbatm_data *, struct atm_dev *);
+ /* called when the proc file is read */
+ int (*proc_read) (struct usbatm_data *, struct atm_dev *, loff_t * pos, char *page);
+
int bulk_in; /* bulk rx endpoint */
int isoc_in; /* isochronous rx endpoint */
int bulk_out; /* bulk tx endpoint */
_
Patches currently in -mm which might be from simon@xxxxxxxxxx are
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
