Commit 06cc1d27 authored by Mark W. McClelland's avatar Mark W. McClelland Committed by Greg Kroah-Hartman

[PATCH] USB: ov511 sysfs conversion (1/3)

This is the first in a series of three patches to convert the ov511
driver's /proc/video interface to sysfs. All V4L drivers must undergo
this conversion now that /proc/video has been removed from the core.

This patch removes ov511's /proc/video support, which allows it to
compile again.
parent ea027460
This diff is collapsed.
......@@ -321,35 +321,6 @@ enum {
RAWFMT_GBR422,
};
/* Unsigned short option numbers */
enum {
OV511_USOPT_INVALID,
OV511_USOPT_BRIGHT,
OV511_USOPT_SAT,
OV511_USOPT_HUE,
OV511_USOPT_CONTRAST,
};
/* Unsigned int option numbers */
enum {
OV511_UIOPT_INVALID,
OV511_UIOPT_POWER_FREQ,
OV511_UIOPT_BFILTER,
OV511_UIOPT_LED,
OV511_UIOPT_DEBUG,
OV511_UIOPT_COMPRESS,
};
struct ov511_ushort_opt {
int optnum; /* Specific option number */
unsigned short val;
};
struct ov511_uint_opt {
int optnum; /* Specific option number */
unsigned int val;
};
struct ov511_i2c_struct {
unsigned char slave; /* Write slave ID (read ID - 1) */
unsigned char reg; /* Index of register */
......@@ -358,15 +329,6 @@ struct ov511_i2c_struct {
};
/* ioctls */
#define OV511IOC_GINTVER _IOR('v', BASE_VIDIOCPRIVATE + 0, int)
#define OV511IOC_GUSHORT _IOWR('v', BASE_VIDIOCPRIVATE + 1, \
struct ov511_ushort_opt)
#define OV511IOC_SUSHORT _IOW('v', BASE_VIDIOCPRIVATE + 2, \
struct ov511_ushort_opt)
#define OV511IOC_GUINT _IOWR('v', BASE_VIDIOCPRIVATE + 3, \
struct ov511_uint_opt)
#define OV511IOC_SUINT _IOW('v', BASE_VIDIOCPRIVATE + 4, \
struct ov511_uint_opt)
#define OV511IOC_WI2C _IOW('v', BASE_VIDIOCPRIVATE + 5, \
struct ov511_i2c_struct)
#define OV511IOC_RI2C _IOWR('v', BASE_VIDIOCPRIVATE + 6, \
......@@ -515,12 +477,6 @@ struct usb_ov511 {
struct semaphore param_lock; /* params lock for this camera */
/* /proc entries, relative to /proc/video/ov511/ */
struct proc_dir_entry *proc_devdir; /* Per-device proc directory */
struct proc_dir_entry *proc_info; /* <minor#>/info entry */
struct proc_dir_entry *proc_button; /* <minor#>/button entry */
struct proc_dir_entry *proc_control; /* <minor#>/control entry */
/* Framebuffer/sbuf management */
int buf_state;
struct semaphore buf_lock;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment