diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 19:35:51 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-29 19:35:51 -0200 |
| commit | e9727f0a3638c9854002f65c0c5b206a815b0ed1 (patch) | |
| tree | 97d93f8a810e2a622ba24049bcc28d9a4e0c9b9f /linux | |
| parent | 0f009089e257b6efff3a202a339e04413132d01f (diff) | |
| download | mediapointer-dvb-s2-e9727f0a3638c9854002f65c0c5b206a815b0ed1.tar.gz mediapointer-dvb-s2-e9727f0a3638c9854002f65c0c5b206a815b0ed1.tar.bz2 | |
More than one driver defines the same var name (dump_bridge). Add
From: Mauro Carvalho Chehab <mchehab@redhat.com>
"static" on stv06xx for all static functions and parameters to avoid
such troubles.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
CC: Erik Andren <erik.andren@gmail.com>
CC: Jean-Francois Moine <moinejf@free.fr>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/gspca/stv06xx/stv06xx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/linux/drivers/media/video/gspca/stv06xx/stv06xx.c b/linux/drivers/media/video/gspca/stv06xx/stv06xx.c index 29e43718b..bb18b64c6 100644 --- a/linux/drivers/media/video/gspca/stv06xx/stv06xx.c +++ b/linux/drivers/media/video/gspca/stv06xx/stv06xx.c @@ -33,10 +33,10 @@ MODULE_AUTHOR("Erik Andrén"); MODULE_DESCRIPTION("STV06XX USB Camera Driver"); MODULE_LICENSE("GPL"); -int dump_bridge; -int dump_sensor; +static int dump_bridge; +static int dump_sensor; -int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data) +static int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data) { int err; struct usb_device *udev = sd->gspca_dev.dev; @@ -57,7 +57,7 @@ int stv06xx_write_bridge(struct sd *sd, u16 address, u16 i2c_data) return (err < 0) ? err : 0; } -int stv06xx_read_bridge(struct sd *sd, u16 address, u8 *i2c_data) +static int stv06xx_read_bridge(struct sd *sd, u16 address, u8 *i2c_data) { int err; struct usb_device *udev = sd->gspca_dev.dev; @@ -77,7 +77,7 @@ int stv06xx_read_bridge(struct sd *sd, u16 address, u8 *i2c_data) /* Wraps the normal write sensor bytes / words functions for writing a single value */ -int stv06xx_write_sensor(struct sd *sd, u8 address, u16 value) +static int stv06xx_write_sensor(struct sd *sd, u8 address, u16 value) { if (sd->sensor->i2c_len == 2) { u16 data[2] = { address, value }; @@ -106,7 +106,7 @@ static int stv06xx_write_sensor_finish(struct sd *sd) return (err < 0) ? err : 0; } -int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len) +static int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len) { int err, i, j; struct usb_device *udev = sd->gspca_dev.dev; @@ -135,7 +135,7 @@ int stv06xx_write_sensor_bytes(struct sd *sd, const u8 *data, u8 len) return stv06xx_write_sensor_finish(sd); } -int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len) +static int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len) { int err, i, j; struct usb_device *udev = sd->gspca_dev.dev; @@ -166,7 +166,7 @@ int stv06xx_write_sensor_words(struct sd *sd, const u16 *data, u8 len) return stv06xx_write_sensor_finish(sd); } -int stv06xx_read_sensor(struct sd *sd, const u8 address, u16 *value) +static int stv06xx_read_sensor(struct sd *sd, const u8 address, u16 *value) { int err; struct usb_device *udev = sd->gspca_dev.dev; @@ -476,7 +476,7 @@ static int sd_probe(struct usb_interface *intf, THIS_MODULE); } -void sd_disconnect(struct usb_interface *intf) +static void sd_disconnect(struct usb_interface *intf) { struct gspca_dev *gspca_dev = usb_get_intfdata(intf); struct sd *sd = (struct sd *) gspca_dev; |