staging: media: zoran: remove detect_guest_activity
Subsystems (2)
PATCH 1/5 staging: media: zoran: remove detect_guest_activity
The detect_guest_activity function is no longer used, so lets removed it.
Signed-off-by Corentin Labbe <[email protected]>
--- drivers/staging/media/zoran/zoran_device.c | 46 ---------------------- drivers/staging/media/zoran/zoran_device.h | 2 - 2 files changed, 48 deletions(-)
drivers/staging/media/zoran/zoran_device.c +0 -46
@@ -166,52 +166,6 @@ static void dump_guests(struct zoran *zr) } } -void detect_guest_activity (struct zoran *zr) -{ -int timeout, i, j, res, guest[8 ], guest0[8 ], change[8 ][3 ]; -ktime_t t0, t1; - -/* do not print random data */ - guest[0 ] =0 ; - guest0[0 ] =0 ; - -dump_guests (zr); -pci_info (zr->pci_dev,"Detecting guests activity, please wait...\n" ); -for (i =1 ; i <8 ; i++)/* Don't read jpeg codec here */ - guest0[i] = guest[i] =post_office_read (zr, i,0 ); - - timeout =0 ; - j =0 ; - t0 =ktime_get (); -while (timeout <10000 ) { -udelay (10 ); - timeout++; -for (i =1 ; (i <8 ) && (j <8 ); i++) { - res =post_office_read (zr, i,0 ); -if (res != guest[i]) { - t1 =ktime_get (); - change[j][0 ] =ktime_to_us (ktime_sub (t1, t0)); - t0 = t1; - change[j][1 ] = i; - change[j][2 ] = res; - j++; - guest[i] = res; - } - } -if (j >=8 ) -break ; - } - -pci_info (zr->pci_dev,"Guests: %*ph\n" ,8 , guest0); - -if (j ==0 ) { -pci_info (zr->pci_dev,"No activity detected.\n" ); -return ; - } -for (i =0 ; i < j; i++) -pci_info (zr->pci_dev,"%6d: %d => 0x%02x\n" , change[i][0 ], change[i][1 ], change[i][2 ]); -} -/* * JPEG Codec access */
drivers/staging/media/zoran/zoran_device.h +0 -2
@@ -20,8 +20,6 @@ extern int post_office_wait(struct zoran *zr);extern int post_office_write (struct zoran *zr,unsigned int guest,unsigned int reg,unsigned int value);extern int post_office_read (struct zoran *zr,unsigned int guest,unsigned int reg); -extern void detect_guest_activity (struct zoran *zr); -extern void jpeg_codec_sleep (struct zoran *zr,int sleep);extern int jpeg_codec_reset (struct zoran *zr);
Signature · 1 line
2.26.3
PATCH 2/5 staging: media: zoran: multiple assignments should be avoided
Remove all multiple assignments.
Signed-off-by Corentin Labbe <[email protected]>
--- drivers/staging/media/zoran/zoran_driver.c | 6 ++++-- drivers/staging/media/zoran/zr36016.c | 3 ++- drivers/staging/media/zoran/zr36050.c | 3 ++- drivers/staging/media/zoran/zr36060.c | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-)
drivers/staging/media/zoran/zoran_driver.c +4 -2
@@ -678,12 +678,14 @@ static int zoran_g_selection(struct file *file, void *__fh, struct v4l2_selectio sel->r.height = zr->jpg_settings.img_height;break ;case V4L2_SEL_TGT_CROP_DEFAULT : - sel->r.top = sel->r.left =0 ; + sel->r.top =0 ; + sel->r.left =0 ; sel->r.width =BUZ_MIN_WIDTH ; sel->r.height =BUZ_MIN_HEIGHT ;break ;case V4L2_SEL_TGT_CROP_BOUNDS : - sel->r.top = sel->r.left =0 ; + sel->r.top =0 ; + sel->r.left =0 ; sel->r.width =BUZ_MAX_WIDTH ; sel->r.height =BUZ_MAX_HEIGHT ;break ;
drivers/staging/media/zoran/zr36016.c +2 -1
@@ -361,7 +361,8 @@ static int zr36016_setup(struct videocodec *codec)return -ENOSPC ; }//mem structure init - codec->data = ptr =kzalloc (sizeof (struct zr36016 ),GFP_KERNEL ); + ptr =kzalloc (sizeof (struct zr36016 ),GFP_KERNEL ); + codec->data = ptr;if (!ptr)return -ENOMEM ;
drivers/staging/media/zoran/zr36050.c +2 -1
@@ -754,7 +754,8 @@ static int zr36050_setup(struct videocodec *codec)return -ENOSPC ; }//mem structure init - codec->data = ptr =kzalloc (sizeof (struct zr36050 ),GFP_KERNEL ); + ptr =kzalloc (sizeof (struct zr36050 ),GFP_KERNEL ); + codec->data = ptr;if (!ptr)return -ENOMEM ;
drivers/staging/media/zoran/zr36060.c +2 -1
@@ -790,7 +790,8 @@ static int zr36060_setup(struct videocodec *codec)return -ENOSPC ; }//mem structure init - codec->data = ptr =kzalloc (sizeof (*ptr),GFP_KERNEL ); + ptr =kzalloc (sizeof (*ptr),GFP_KERNEL ); + codec->data = ptr;if (!ptr)return -ENOMEM ;
Signature · 1 line
2.26.3
PATCH 3/5 staging: media: zoran: remove blank line
In reply to Corentin LabbeMinor style fix by removing useless blank line.
Signed-off-by Corentin Labbe <[email protected]>
--- drivers/staging/media/zoran/zoran.h | 1 - 1 file changed, 1 deletion(-)
drivers/staging/media/zoran/zoran.h +0 -1
@@ -158,7 +158,6 @@ struct zoran_jpg_settings {struct v4l2_jpegcompression jpg_comp;/* JPEG-specific capture settings */ }; -struct zoran ;/* zoran_fh contains per-open() settings */
Signature · 1 line
2.26.3
PATCH 4/5 staging: media: zoran: fix kzalloc style
In reply to Corentin LabbePrefer kzalloc(sizeof(*prt)...) over kzalloc(sizeof(struct.../
Signed-off-by Corentin Labbe <[email protected]>
--- drivers/staging/media/zoran/zr36016.c | 2 +- drivers/staging/media/zoran/zr36050.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/zoran/zr36016.c +1 -1
@@ -361,7 +361,7 @@ static int zr36016_setup(struct videocodec *codec)return -ENOSPC ; }//mem structure init - ptr =kzalloc (sizeof (struct zr36016 ),GFP_KERNEL ); + ptr =kzalloc (sizeof (*ptr),GFP_KERNEL ); codec->data = ptr;if (!ptr)return -ENOMEM ;
drivers/staging/media/zoran/zr36050.c +1 -1
@@ -754,7 +754,7 @@ static int zr36050_setup(struct videocodec *codec)return -ENOSPC ; }//mem structure init - ptr =kzalloc (sizeof (struct zr36050 ),GFP_KERNEL ); + ptr =kzalloc (sizeof (*ptr),GFP_KERNEL ); codec->data = ptr;if (!ptr)return -ENOMEM ;
Signature · 1 line
2.26.3
PATCH 5/5 staging: media: zoran: change asm header
In reply to Corentin LabbeAs asked by checkpatch, convert a asm/xxx header to a linux one.
Signed-off-by Corentin Labbe <[email protected]>
--- drivers/staging/media/zoran/zr36050.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/zoran/zr36050.c +1 -1
@@ -16,7 +16,7 @@#include <linux/wait.h> /* I/O commands, error codes */ -#include <asm/io.h> +#include <linux/io.h> /* headerfile of this module */ #include "zr36050.h"
Signature · 1 line
2.26.3