ChangeSet 1.1276.1.49, 2003/08/27 17:14:59-07:00, [EMAIL PROTECTED]
[PATCH] USB: rip out old proc code from the usbvideo driver.
This removes the compiler warning from this driver.
drivers/usb/media/usbvideo.c | 193 -------------------------------------------
drivers/usb/media/usbvideo.h | 7 -
2 files changed, 1 insertion(+), 199 deletions(-)
diff -Nru a/drivers/usb/media/usbvideo.c b/drivers/usb/media/usbvideo.c
--- a/drivers/usb/media/usbvideo.c Tue Sep 2 12:43:31 2003
+++ b/drivers/usb/media/usbvideo.c Tue Sep 2 12:43:31 2003
@@ -37,24 +37,9 @@
static int video_nr = -1;
MODULE_PARM(video_nr, "i");
-#warning please convert me from procfs to sysfs
-#define USES_PROC_FS 0
/*
* Local prototypes.
*/
-#if USES_PROC_FS
-static void usbvideo_procfs_level1_create(struct usbvideo *ut);
-static void usbvideo_procfs_level1_destroy(struct usbvideo *ut);
-static void usbvideo_procfs_level2_create(struct uvd *uvd);
-static void usbvideo_procfs_level2_destroy(struct uvd *uvd);
-static int usbvideo_default_procfs_read_proc(
- char *page, char **start, off_t off, int count,
- int *eof, void *data);
-static int usbvideo_default_procfs_write_proc(
- struct file *file, const char *buffer,
- unsigned long count, void *data);
-#endif
-
static void usbvideo_Disconnect(struct usb_interface *intf);
static void usbvideo_CameraRelease(struct uvd *uvd);
@@ -813,24 +798,7 @@
cams->cb.startDataPump = usbvideo_StartDataPump;
if (cams->cb.stopDataPump == NULL)
cams->cb.stopDataPump = usbvideo_StopDataPump;
-#if USES_PROC_FS
- /*
- * If both /proc fs callbacks are NULL then we assume that the driver
- * does not need procfs services at all. Leave them NULL.
- */
- cams->uses_procfs = (cams->cb.procfs_read != NULL) || (cams->cb.procfs_write
== NULL);
- if (cams->uses_procfs) {
- if (cams->cb.procfs_read == NULL)
- cams->cb.procfs_read = usbvideo_default_procfs_read_proc;
- if (cams->cb.procfs_write == NULL)
- cams->cb.procfs_write = usbvideo_default_procfs_write_proc;
- }
-#else /* !USES_PROC_FS */
- /* Report a warning so that user knows why there is no /proc entries */
- if ((cams->cb.procfs_read != NULL) || (cams->cb.procfs_write == NULL)) {
- dbg("%s: /proc fs support requested but not configured!",
__FUNCTION__);
- }
-#endif
+
cams->num_cameras = num_cams;
cams->cam = (struct uvd *) &cams[1];
cams->md_module = md;
@@ -871,13 +839,6 @@
cams->usbdrv.disconnect = cams->cb.disconnect;
cams->usbdrv.id_table = id_table;
-#if USES_PROC_FS
- if (cams->uses_procfs) {
- dbg("%s: Creating /proc filesystem entries.", __FUNCTION__);
- usbvideo_procfs_level1_create(cams);
- }
-#endif
-
/*
* Update global handle to usbvideo. This is very important
* because probe() can be called before usb_register() returns.
@@ -920,13 +881,6 @@
return;
}
-#if USES_PROC_FS
- if (cams->uses_procfs) {
- dbg("%s: Deregistering filesystem entries.", __FUNCTION__);
- usbvideo_procfs_level1_destroy(cams);
- }
-#endif
-
dbg("%s: Deregistering %s driver.", __FUNCTION__, cams->drvName);
usb_deregister(&cams->usbdrv);
@@ -1041,14 +995,6 @@
return;
}
-#if USES_PROC_FS
- assert(uvd->handle != NULL);
- if (uvd->handle->uses_procfs) {
- dbg("%s: Removing /proc/%s/ filesystem entries.", __FUNCTION__,
uvd->handle->drvName);
- usbvideo_procfs_level2_destroy(uvd);
- }
-#endif
-
RingQueue_Free(&uvd->dp);
if (VALID_CALLBACK(uvd, userFree))
GET_CALLBACK(uvd, userFree)(uvd);
@@ -1200,17 +1146,6 @@
(uvd->handle != NULL) ? uvd->handle->drvName : "???",
uvd->vdev.minor, tmp2, tmp1);
-#if USES_PROC_FS
- assert(uvd->handle != NULL);
- if (uvd->handle->uses_procfs) {
- if (uvd->debug > 0) {
- info("%s: Creating /proc/video/%s/ filesystem entries.",
- __FUNCTION__, uvd->handle->drvName);
- }
- usbvideo_procfs_level2_create(uvd);
- }
-#endif
-
usb_get_dev(uvd->dev);
return 0;
}
@@ -2345,130 +2280,4 @@
}
}
-/*
- * /proc interface
- *
- * We will be creating directories and entries under /proc/video using
- * external 'video_proc_entry' directory which is exported by videodev.o
- * module. Within that directory we will create $driver/ directory to
- * uniquely and uniformly refer to our specific $driver. Within that
- * directory we will finally create an entry that is named after the
- * video device node - video3, for example. The format of that file
- * is determined by callbacks that the minidriver may provide. If no
- * callbacks are provided (neither read nor write) then we don't create
- * the entry.
- *
- * Here is a sample directory entry: /proc/video/ibmcam/video3
- *
- * The "file" video3 (in example above) is readable and writeable, in
- * theory. If the minidriver provides callbacks to do reading and
- * writing then both those procedures are supported. However if the
- * driver leaves callbacks in default (NULL) state the default
- * read and write handlers are used. The default read handler reports
- * that the driver does not support /proc fs. The default write handler
- * returns error code on any write attempt.
- */
-
-#if USES_PROC_FS
-
-extern struct proc_dir_entry *video_proc_entry;
-
-static void usbvideo_procfs_level1_create(struct usbvideo *ut)
-{
- if (ut == NULL) {
- err("%s: ut == NULL", __FUNCTION__);
- return;
- }
- if (video_proc_entry == NULL) {
- err("%s: /proc/video/ doesn't exist.", __FUNCTION__);
- return;
- }
- ut->procfs_dEntry = create_proc_entry(ut->drvName, S_IFDIR, video_proc_entry);
- if (ut->procfs_dEntry != NULL) {
- if (ut->md_module != NULL)
- ut->procfs_dEntry->owner = ut->md_module;
- } else {
- err("%s: Unable to initialize /proc/video/%s", __FUNCTION__,
ut->drvName);
- }
-}
-
-static void usbvideo_procfs_level1_destroy(struct usbvideo *ut)
-{
- if (ut == NULL) {
- err("%s: ut == NULL", __FUNCTION__);
- return;
- }
- if (ut->procfs_dEntry != NULL) {
- remove_proc_entry(ut->drvName, video_proc_entry);
- ut->procfs_dEntry = NULL;
- }
-}
-
-static void usbvideo_procfs_level2_create(struct uvd *uvd)
-{
- if (uvd == NULL) {
- err("%s: uvd == NULL", __FUNCTION__);
- return;
- }
- assert(uvd->handle != NULL);
- if (uvd->handle->procfs_dEntry == NULL) {
- err("%s: uvd->handle->procfs_dEntry == NULL", __FUNCTION__);
- return;
- }
-
- sprintf(uvd->videoName, "video%d", uvd->vdev.minor);
- uvd->procfs_vEntry = create_proc_entry(
- uvd->videoName,
- S_IFREG | S_IRUGO | S_IWUSR,
- uvd->handle->procfs_dEntry);
- if (uvd->procfs_vEntry != NULL) {
- uvd->procfs_vEntry->data = uvd;
- uvd->procfs_vEntry->read_proc = uvd->handle->cb.procfs_read;
- uvd->procfs_vEntry->write_proc = uvd->handle->cb.procfs_write;
- } else {
- err("%s: Failed to create entry \"%s\"", __FUNCTION__, uvd->videoName);
- }
-}
-
-static void usbvideo_procfs_level2_destroy(struct uvd *uvd)
-{
- if (uvd == NULL) {
- err("%s: uvd == NULL", __FUNCTION__);
- return;
- }
- if (uvd->procfs_vEntry != NULL) {
- remove_proc_entry(uvd->videoName, uvd->procfs_vEntry);
- uvd->procfs_vEntry = NULL;
- }
-}
-
-static int usbvideo_default_procfs_read_proc(
- char *page, char **start, off_t off, int count,
- int *eof, void *data)
-{
- char *out = page;
- int len;
-
- /* Stay under PAGE_SIZE or else */
- out += sprintf(out, "This driver does not support /proc services.\n");
- len = out - page;
- len -= off;
- if (len < count) {
- *eof = 1;
- if (len <= 0)
- return 0;
- } else
- len = count;
- *start = page + off;
- return len;
-}
-
-static int usbvideo_default_procfs_write_proc(
- struct file *file, const char *buffer,
- unsigned long count, void *data)
-{
- return -EINVAL;
-}
-
-#endif /* USES_PROC_FS */
MODULE_LICENSE("GPL");
diff -Nru a/drivers/usb/media/usbvideo.h b/drivers/usb/media/usbvideo.h
--- a/drivers/usb/media/usbvideo.h Tue Sep 2 12:43:31 2003
+++ b/drivers/usb/media/usbvideo.h Tue Sep 2 12:43:31 2003
@@ -17,14 +17,12 @@
#define usbvideo_h
#include <linux/config.h>
-#include <linux/proc_fs.h>
#include <linux/videodev.h>
#include <linux/usb.h>
/* Most helpful debugging aid */
#define assert(expr) ((void) ((expr) ? 0 : (err("assert failed at line
%d",__LINE__))))
-#define USES_PROC_FS (defined(CONFIG_PROC_FS) && defined(CONFIG_VIDEO_PROC_FS))
#define USBVIDEO_REPORT_STATS 1 /* Set to 0 to block statistics on close */
/* Bit flags (options) */
@@ -244,7 +242,6 @@
struct video_capability vcap; /* Video capabilities */
struct video_channel vchan; /* May be used for tuner support */
struct usbvideo_statistics stats;
- struct proc_dir_entry *procfs_vEntry; /* /proc/video/MYDRIVER/video2 */
char videoName[32]; /* Holds name like "video7" */
};
@@ -266,8 +263,6 @@
int (*getFPS)(struct uvd *);
int (*overlayHook)(struct uvd *, struct usbvideo_frame *);
int (*getFrame)(struct uvd *, int);
- int (*procfs_read)(char *page,char **start,off_t off,int count,int *eof,void
*data);
- int (*procfs_write)(struct file *file,const char *buffer,unsigned long
count,void *data);
int (*startDataPump)(struct uvd *uvd);
void (*stopDataPump)(struct uvd *uvd);
int (*setVideoMode)(struct uvd *uvd, struct video_window *vw);
@@ -281,8 +276,6 @@
struct usbvideo_cb cb; /* Table of callbacks (virtual methods) */
struct video_device vdt; /* Video device template */
struct uvd *cam; /* Array of camera structures */
- int uses_procfs; /* Non-zero if we create /proc entries */
- struct proc_dir_entry *procfs_dEntry; /* /proc/video/MYDRIVER */
struct module *md_module; /* Minidriver module */
};
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
[EMAIL PROTECTED]
To unsubscribe, use the last form field at:
https://lists.sourceforge.net/lists/listinfo/linux-usb-devel
