mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-11-01 17:08:10 +00:00
Code Issues Releases Wiki Activity

staging/easycap: use regget for register back reading

Browse source 
Use regget to reading back what was written to a register.
This required changning size argument to regget signature

On the way remove usless variable casting

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Tomas Winkler 2011-02-09 01:12:50 +02:00 committed by Greg Kroah-Hartman
parent 73132ce45a
commit 32851b325e
1 changed files with 12 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
drivers/staging/easycap/easycap_low.c
View file

@ -43,7 +43,7 @@
#define GET(X, Y, Z) do { \ #define GET(X, Y, Z) do { \
int __rc; \ int __rc; \
*(Z) = (u16)0; \ *(Z) = (u16)0; \
__rc = regget(X, Y, Z); \ __rc = regget(X, Y, Z, sizeof(u8)); \
if (0 > __rc) { \ if (0 > __rc) { \
JOT(8, ":-(%i\n", __LINE__); return __rc; \ JOT(8, ":-(%i\n", __LINE__); return __rc; \
} \ } \
@ -256,7 +256,8 @@ static const struct saa7113config saa7113configNTSC[256] = {
{0xFF, 0xFF} {0xFF, 0xFF}
}; };
static int regget(struct usb_device *pusb_device, u16 index, void *pvoid) static int regget(struct usb_device *pusb_device,
u16 index, void *reg, int reg_size)
{ {
int rc; int rc;
@ -264,46 +265,32 @@ static int regget(struct usb_device *pusb_device, u16 index, void *pvoid)
return -ENODEV; return -ENODEV;
rc = usb_control_msg(pusb_device, usb_rcvctrlpipe(pusb_device, 0), rc = usb_control_msg(pusb_device, usb_rcvctrlpipe(pusb_device, 0),
(u8)0x00, 0x00,
(u8)(USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE), (USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE),
(u16)0x00, 0x00,
(u16)index, index, reg, reg_size, 50000);
(void *)pvoid,
sizeof(u8),
(int)50000);
return 0xFF & rc; return 0xFF & rc;
} }
static int regset(struct usb_device *pusb_device, u16 index, u16 value) static int regset(struct usb_device *pusb_device, u16 index, u16 value)
{ {
u16 igot;
int rc0, rc1; int rc0, rc1;
u16 igot;
if (!pusb_device) if (!pusb_device)
return -ENODEV; return -ENODEV;
rc1 = 0; igot = 0; rc1 = 0; igot = 0;
rc0 = usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0), rc0 = usb_control_msg(pusb_device, usb_sndctrlpipe(pusb_device, 0),
(u8)0x01, 0x01,
(u8)(USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE), (USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE),
(u16)value, value, index, NULL, 0, 500);
(u16)index,
NULL,
(u16)0,
(int)500);
#ifdef NOREADBACK #ifdef NOREADBACK
# #
#else #else
rc1 = usb_control_msg(pusb_device, usb_rcvctrlpipe(pusb_device, 0), rc1 = regget(pusb_device, index, &igot, sizeof(igot));
(u8)0x00,
(u8)(USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE),
(u16)0x00,
(u16)index,
(void *)&igot,
(u16)sizeof(u16),
(int)50000);
igot = 0xFF & igot; igot = 0xFF & igot;
switch (index) { switch (index) {
case 0x000: case 0x000: