summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--linux/drivers/media/dvb/frontends/xc5000.c2
-rw-r--r--linux/drivers/media/radio/radio-si470x.c7
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-core.c2
-rw-r--r--linux/drivers/media/video/em28xx/em28xx-video.c8
-rw-r--r--linux/drivers/media/video/em28xx/em28xx.h2
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-yuv.c6
-rw-r--r--linux/drivers/media/video/stk-sensor.c4
-rw-r--r--linux/drivers/media/video/stk-webcam.c2
-rw-r--r--linux/drivers/media/video/stk-webcam.h2
-rw-r--r--linux/drivers/media/video/tuner-core.c2
-rwxr-xr-xmailimport34
11 files changed, 37 insertions, 34 deletions
diff --git a/linux/drivers/media/dvb/frontends/xc5000.c b/linux/drivers/media/dvb/frontends/xc5000.c
index 58235d007..e50924d97 100644
--- a/linux/drivers/media/dvb/frontends/xc5000.c
+++ b/linux/drivers/media/dvb/frontends/xc5000.c
@@ -151,7 +151,7 @@ typedef struct {
#define FM_Radio_INPUT2 21
#define FM_Radio_INPUT1 22
-XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
+static XC_TV_STANDARD XC5000_Standard[MAX_TV_STANDARD] = {
{"M/N-NTSC/PAL-BTSC", 0x0400, 0x8020},
{"M/N-NTSC/PAL-A2", 0x0600, 0x8020},
{"M/N-NTSC/PAL-EIAJ", 0x0440, 0x8020},
diff --git a/linux/drivers/media/radio/radio-si470x.c b/linux/drivers/media/radio/radio-si470x.c
index ed64929dc..7be7b0916 100644
--- a/linux/drivers/media/radio/radio-si470x.c
+++ b/linux/drivers/media/radio/radio-si470x.c
@@ -559,7 +559,7 @@ static int si470x_get_rds_registers(struct si470x_device *radio)
(void *) &buf, sizeof(buf), &size, usb_timeout);
if (size != sizeof(buf))
printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_register: "
- "return size differs: %d != %d\n", size, sizeof(buf));
+ "return size differs: %d != %ld\n", size, sizeof(buf));
if (retval < 0)
printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_registers: "
"usb_interrupt_msg returned %d\n", retval);
@@ -1440,11 +1440,10 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
{
struct si470x_device *radio = usb_get_intfdata(intf);
- del_timer_sync(&radio->timer);
- flush_scheduled_work();
-
usb_set_intfdata(intf, NULL);
if (radio) {
+ del_timer_sync(&radio->timer);
+ flush_scheduled_work();
video_unregister_device(radio->videodev);
kfree(radio->buffer);
kfree(radio);
diff --git a/linux/drivers/media/video/em28xx/em28xx-core.c b/linux/drivers/media/video/em28xx/em28xx-core.c
index 7a15a69fb..a0ec1cfbc 100644
--- a/linux/drivers/media/video/em28xx/em28xx-core.c
+++ b/linux/drivers/media/video/em28xx/em28xx-core.c
@@ -288,7 +288,7 @@ int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len)
* sets only some bits (specified by bitmask) of a register, by first reading
* the actual value
*/
-int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
+static int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
u8 bitmask)
{
int oldval;
diff --git a/linux/drivers/media/video/em28xx/em28xx-video.c b/linux/drivers/media/video/em28xx/em28xx-video.c
index 284b385fb..7af56469e 100644
--- a/linux/drivers/media/video/em28xx/em28xx-video.c
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c
@@ -1871,10 +1871,10 @@ void em28xx_unregister_extension(struct em28xx_ops *ops)
}
EXPORT_SYMBOL(em28xx_unregister_extension);
-struct video_device *em28xx_vdev_init(struct em28xx *dev,
- const struct video_device *template,
- const int type,
- const char *type_name)
+static struct video_device *em28xx_vdev_init(struct em28xx *dev,
+ const struct video_device *template,
+ const int type,
+ const char *type_name)
{
struct video_device *vfd;
diff --git a/linux/drivers/media/video/em28xx/em28xx.h b/linux/drivers/media/video/em28xx/em28xx.h
index efabaf6d1..2a797f622 100644
--- a/linux/drivers/media/video/em28xx/em28xx.h
+++ b/linux/drivers/media/video/em28xx/em28xx.h
@@ -360,8 +360,6 @@ int em28xx_read_reg(struct em28xx *dev, u16 reg);
int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
int len);
int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
-int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
- u8 bitmask);
int em28xx_set_audio_source(struct em28xx *dev);
int em28xx_audio_analog_set(struct em28xx *dev);
diff --git a/linux/drivers/media/video/ivtv/ivtv-yuv.c b/linux/drivers/media/video/ivtv/ivtv-yuv.c
index 85183480a..8fdd67cef 100644
--- a/linux/drivers/media/video/ivtv/ivtv-yuv.c
+++ b/linux/drivers/media/video/ivtv/ivtv-yuv.c
@@ -914,7 +914,7 @@ static void ivtv_yuv_init(struct ivtv *itv)
}
/* Get next available yuv buffer on PVR350 */
-void ivtv_yuv_next_free(struct ivtv *itv)
+static void ivtv_yuv_next_free(struct ivtv *itv)
{
int draw, display;
struct yuv_playback_info *yi = &itv->yuv_info;
@@ -937,7 +937,7 @@ void ivtv_yuv_next_free(struct ivtv *itv)
}
/* Set up frame according to ivtv_dma_frame parameters */
-void ivtv_yuv_setup_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
+static void ivtv_yuv_setup_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
{
struct yuv_playback_info *yi = &itv->yuv_info;
u8 frame = yi->draw_frame;
@@ -1042,7 +1042,7 @@ void ivtv_yuv_frame_complete(struct ivtv *itv)
(itv->yuv_info.draw_frame + 1) % IVTV_YUV_BUFFERS);
}
-int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
+static int ivtv_yuv_udma_frame(struct ivtv *itv, struct ivtv_dma_frame *args)
{
DEFINE_WAIT(wait);
int rc = 0;
diff --git a/linux/drivers/media/video/stk-sensor.c b/linux/drivers/media/video/stk-sensor.c
index 1a8692d9e..e546b014d 100644
--- a/linux/drivers/media/video/stk-sensor.c
+++ b/linux/drivers/media/video/stk-sensor.c
@@ -225,7 +225,7 @@
/* Returns 0 if OK */
-int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
+static int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
{
int i = 0;
int tmpval = 0;
@@ -250,7 +250,7 @@ int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val)
return 0;
}
-int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)
+static int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val)
{
int i = 0;
int tmpval = 0;
diff --git a/linux/drivers/media/video/stk-webcam.c b/linux/drivers/media/video/stk-webcam.c
index 1c64afe71..589b6aec9 100644
--- a/linux/drivers/media/video/stk-webcam.c
+++ b/linux/drivers/media/video/stk-webcam.c
@@ -64,7 +64,7 @@ static struct usb_device_id stkwebcam_table[] = {
};
MODULE_DEVICE_TABLE(usb, stkwebcam_table);
-void stk_camera_cleanup(struct kref *kref)
+static void stk_camera_cleanup(struct kref *kref)
{
struct stk_camera *dev = to_stk_camera(kref);
diff --git a/linux/drivers/media/video/stk-webcam.h b/linux/drivers/media/video/stk-webcam.h
index a2164cb1a..df4dfefc5 100644
--- a/linux/drivers/media/video/stk-webcam.h
+++ b/linux/drivers/media/video/stk-webcam.h
@@ -128,8 +128,6 @@ void stk_camera_delete(struct kref *);
int stk_camera_write_reg(struct stk_camera *, u16, u8);
int stk_camera_read_reg(struct stk_camera *, u16, int *);
-int stk_sensor_outb(struct stk_camera *dev, u8 reg, u8 val);
-int stk_sensor_inb(struct stk_camera *dev, u8 reg, u8 *val);
int stk_sensor_init(struct stk_camera *);
int stk_sensor_configure(struct stk_camera *);
int stk_sensor_sleep(struct stk_camera *dev);
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c
index 209857aef..95bb41cee 100644
--- a/linux/drivers/media/video/tuner-core.c
+++ b/linux/drivers/media/video/tuner-core.c
@@ -1082,7 +1082,7 @@ static int tuner_resume(struct i2c_client *c)
/* ---------------------------------------------------------------------- */
-LIST_HEAD(tuner_list);
+static LIST_HEAD(tuner_list);
/* Search for existing radio and/or TV tuners on the given I2C adapter.
Note that when this function is called from tuner_probe you can be
diff --git a/mailimport b/mailimport
index b13f4c662..aa56bb284 100755
--- a/mailimport
+++ b/mailimport
@@ -141,7 +141,8 @@ proccess_patch ()
{
i="$_"
- if [ "`diffstat -p1 -l $i`" == "" ]; then
+ echo $i
+ if [ "`diffstat -p1 -l "$i"`" == "" ]; then
echo "*** ERROR nothing to commit"
cd $cur
exit
@@ -197,7 +198,13 @@ if [ "$CHECKPATCH" == "" ]; then
CHECKPATCH="/lib/modules/`uname -r`/build/scripts/checkpatch.pl"
fi
-DIR=$TMPDIR/mailimport$$
+NAME="$1"
+
+if [ ! -r $NAME ]; then
+ sudo chmod -R og+r $NAME
+fi
+
+DIR="$TMPDIR/mailimport$$"
mkdir $DIR
if [ "$?" != "0" ]; then
echo "*** Error at mkdir $DIR"
@@ -205,24 +212,26 @@ if [ "$?" != "0" ]; then
fi
trap "rm -rf $DIR" EXIT
-if [ -d "$1" ]; then
- TMP2=$DIR/patchheader
+if [ -d "$NAME" ]; then
+ TMP2="$DIR/patchheader"
- if [ -e "$1/series" ]; then
- for i in `cat "$1/series"|grep -v "^#"`; do
- echo $1/$i
- proccess_patch "$1/$i"
+ if [ -e "$NAME/series" ]; then
+ echo "Processing quilt tree $NAME"
+ for i in `cat "$NAME/series"|grep -v "^#"`; do
+ echo "$NAME/$i"
+ proccess_patch "$NAME/$i"
done
else
- for i in $1/*; do
- proccess_patch $i
+ echo "Processing patches from tree $NAME"
+ for i in $NAME/*; do
+ echo "$i"
+ proccess_patch "$i"
done
fi
else
- MBOX="$1"
TMP2=$DIR/patchheader
- grep -v -f - $MBOX >$DIR/tmpbox <<EOF
+ grep -v -f - $NAME >$DIR/tmpbox <<EOF
^Content-Type:
^--Boundary-
^Content-Disposition: inline
@@ -239,4 +248,3 @@ EOF
proccess_patch $i
done
fi
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-09 09:05:07 +0000