Skip to content

Commit

Permalink
staging/easycap: wait_i2c should be static
Browse files Browse the repository at this point in the history
wait_i2c is only used from easycap_low.c
so remove it from the easycap.h and mark it static

Cc: Mike Thomas <rmthomas@sciolus.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Tomas Winkler authored and Greg Kroah-Hartman committed Mar 7, 2011
1 parent 4495c15 commit fd49b78
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 32 deletions.
1 change: 0 additions & 1 deletion drivers/staging/easycap/easycap.h
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,6 @@ int set_resolution(struct usb_device *,
int read_saa(struct usb_device *, u16);
int read_stk(struct usb_device *, u32);
int write_saa(struct usb_device *, u16, u16);
int wait_i2c(struct usb_device *);
int write_000(struct usb_device *, u16, u16);
int start_100(struct usb_device *);
int stop_100(struct usb_device *);
Expand Down
61 changes: 30 additions & 31 deletions drivers/staging/easycap/easycap_low.c
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,36 @@ static int regset(struct usb_device *pusb_device, u16 index, u16 value)

return rc;
}
/*****************************************************************************/
/*--------------------------------------------------------------------------*/
/*
* FUNCTION wait_i2c() RETURNS 0 ON SUCCESS
*/
/*--------------------------------------------------------------------------*/
static int wait_i2c(struct usb_device *p)
{
u16 get0;
u8 igot;
const int max = 2;
int k;

if (!p)
return -ENODEV;

for (k = 0; k < max; k++) {
GET(p, 0x0201, &igot); get0 = igot;
switch (get0) {
case 0x04:
case 0x01:
return 0;
case 0x00:
msleep(20);
continue;
default:
return get0 - 1;
}
}
return -1;
}

/****************************************************************************/
int confirm_resolution(struct usb_device *p)
Expand Down Expand Up @@ -935,36 +964,6 @@ int stop_100(struct usb_device *p)
return 0;
}
/****************************************************************************/
/*--------------------------------------------------------------------------*/
/*
* FUNCTION wait_i2c() RETURNS 0 ON SUCCESS
*/
/*--------------------------------------------------------------------------*/
int wait_i2c(struct usb_device *p)
{
u16 get0;
u8 igot;
const int max = 2;
int k;

if (!p)
return -ENODEV;

for (k = 0; k < max; k++) {
GET(p, 0x0201, &igot); get0 = igot;
switch (get0) {
case 0x04:
case 0x01:
return 0;
case 0x00:
msleep(20);
continue;
default:
return get0 - 1;
}
}
return -1;
}
/****************************************************************************/
/*****************************************************************************/
int wakeup_device(struct usb_device *pusb_device)
Expand Down

0 comments on commit fd49b78

Please sign in to comment.