evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging/easycap: revamp reset function

Browse source 
fix indentation and drop success statements printouts
that just causes code be less readable

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-03-30 12:15:30 +02:00 • committed by Greg Kroah-Hartman
parent 19cb28483a
commit fd1b821c31
1 changed files with 24 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
drivers/staging/easycap/easycap_main.c
View file

@ -201,9 +201,9 @@ static int easycap_open(struct inode *inode, struct file *file)
static int reset(struct easycap *peasycap) static int reset(struct easycap *peasycap)
{ {
struct easycap_standard const *peasycap_standard; struct easycap_standard const *peasycap_standard;
int i, rc, input, rate; int fmtidx, input, rate;
bool ntsc, other; bool ntsc, other;
int fmtidx; int rc;
if (!peasycap) { if (!peasycap) {
SAY("ERROR: peasycap is NULL\n"); SAY("ERROR: peasycap is NULL\n");
@ -226,33 +226,27 @@ static int reset(struct easycap *peasycap)
JOM(8, "peasycap->ntsc=%d\n", peasycap->ntsc); JOM(8, "peasycap->ntsc=%d\n", peasycap->ntsc);
rate = ready_saa(peasycap->pusb_device); rate = ready_saa(peasycap->pusb_device);
if (0 > rate) { if (rate < 0) {
JOM(8, "not ready to capture after %i ms ...\n", PATIENCE); JOM(8, "not ready to capture after %i ms ...\n", PATIENCE);
if (peasycap->ntsc) { ntsc = !peasycap->ntsc;
JOM(8, "... trying PAL ...\n"); ntsc = false; JOM(8, "... trying %s ..\n", ntsc ? "NTSC" : "PAL");
} else { rc = setup_stk(peasycap->pusb_device, ntsc);
JOM(8, "... trying NTSC ...\n"); ntsc = true; if (rc) {
} SAM("ERROR: setup_stk() rc = %i\n", rc);
rc = setup_stk(peasycap->pusb_device, ntsc); return -EFAULT;
if (0 == rc) }
JOM(4, "setup_stk() OK\n"); rc = setup_saa(peasycap->pusb_device, ntsc);
else { if (rc) {
SAM("ERROR: setup_stk() rc = %i\n", rc); SAM("ERROR: setup_saa() rc = %i\n", rc);
return -EFAULT; return -EFAULT;
} }
rc = setup_saa(peasycap->pusb_device, ntsc);
if (0 == rc) rate = ready_saa(peasycap->pusb_device);
JOM(4, "setup_saa() OK\n"); if (rate < 0) {
else { JOM(8, "not ready to capture after %i ms\n", PATIENCE);
SAM("ERROR: setup_saa() rc = %i\n", rc); JOM(8, "... saa register 0x1F has 0x%02X\n",
return -EFAULT;
}
rate = ready_saa(peasycap->pusb_device);
if (0 > rate) {
JOM(8, "not ready to capture after %i ms ...\n", PATIENCE);
JOM(8, "... saa register 0x1F has 0x%02X\n",
read_saa(peasycap->pusb_device, 0x1F)); read_saa(peasycap->pusb_device, 0x1F));
ntsc = peasycap->ntsc; ntsc = peasycap->ntsc;
} else { } else {
JOM(8, "... success at second try: %i=rate\n", rate); JOM(8, "... success at second try: %i=rate\n", rate);
ntsc = (0 < (rate/2)) ? true : false ; ntsc = (0 < (rate/2)) ? true : false ;
@ -266,22 +260,17 @@ static int reset(struct easycap *peasycap)
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
rc = setup_stk(peasycap->pusb_device, ntsc); rc = setup_stk(peasycap->pusb_device, ntsc);
if (0 == rc) if (rc) {
JOM(4, "setup_stk() OK\n");
else {
SAM("ERROR: setup_stk() rc = %i\n", rc); SAM("ERROR: setup_stk() rc = %i\n", rc);
return -EFAULT; return -EFAULT;
} }
rc = setup_saa(peasycap->pusb_device, ntsc); rc = setup_saa(peasycap->pusb_device, ntsc);
if (0 == rc) if (rc) {
JOM(4, "setup_saa() OK\n");
else {
SAM("ERROR: setup_saa() rc = %i\n", rc); SAM("ERROR: setup_saa() rc = %i\n", rc);
return -EFAULT; return -EFAULT;
} }
for (i = 0; i < 180; i++) memset(peasycap->merit, 0, sizeof(peasycap->merit));
peasycap->merit[i] = 0;
peasycap->video_eof = 0; peasycap->video_eof = 0;
peasycap->audio_eof = 0; peasycap->audio_eof = 0;