V4L/DVB (10009): gspca - m5602: Convert some functions to be static

[mv-sheeva.git] / drivers / media / video / gspca / m5602 / m5602_s5k4aa.c

diff --git a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
index 14b1eac5b812517723e79a9fa910cf061ee6c099..4824afe67ff2057360c2f209c959bbf7c22e26ef 100644 (file)
--- a/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
+++ b/drivers/media/video/gspca/m5602/m5602_s5k4aa.c
@@ -18,6 +18,40 @@
 
 #include "m5602_s5k4aa.h"
 
+static
+    const
+       struct dmi_system_id s5k4aa_vflip_dmi_table[] = {
+       {
+               .ident = "Fujitsu-Siemens Amilo Xa 2528",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xa 2528")
+               }
+       }, {
+               .ident = "Fujitsu-Siemens Amilo Xi 2550",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Xi 2550")
+               }
+       }, {
+               .ident = "MSI GX700",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700"),
+                       DMI_MATCH(DMI_BIOS_DATE, "07/26/2007")
+               }
+       }, {
+               .ident = "MSI GX700/GX705/EX700",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Micro-Star International"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "GX700/GX705/EX700")
+               }
+       },
+       { }
+};
+
+static void s5k4aa_dump_registers(struct sd *sd);
+
 int s5k4aa_probe(struct sd *sd)
 {
        u8 prod_id[6] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
@@ -75,6 +109,7 @@ int s5k4aa_probe(struct sd *sd)
                return -ENODEV;
        else
                info("Detected a s5k4aa sensor");
+
 sensor_found:
        sd->gspca_dev.cam.cam_mode = s5k4aa.modes;
        sd->gspca_dev.cam.nmodes = s5k4aa.nmodes;
@@ -114,14 +149,14 @@ int s5k4aa_read_sensor(struct sd *sd, const u8 address,
        if (err < 0)
                goto out;
 
-       for (i = 0; (i < len) & !err; i++) {
+       for (i = 0; (i < len) && !err; i++) {
                err = m5602_read_bridge(sd, M5602_XB_I2C_DATA, &(i2c_data[i]));
 
                PDEBUG(D_CONF, "Reading sensor register "
                                  "0x%x containing 0x%x ", address, *i2c_data);
        }
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_write_sensor(struct sd *sd, const u8 address,
@@ -250,7 +285,7 @@ int s5k4aa_get_exposure(struct gspca_dev *gspca_dev, __s32 *val)
        *val |= data;
        PDEBUG(D_V4L2, "Read exposure %d", *val);
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
@@ -270,7 +305,7 @@ int s5k4aa_set_exposure(struct gspca_dev *gspca_dev, __s32 val)
        data = val & 0xff;
        err = s5k4aa_write_sensor(sd, S5K4AA_EXPOSURE_LO, &data, 1);
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
@@ -288,7 +323,7 @@ int s5k4aa_get_vflip(struct gspca_dev *gspca_dev, __s32 *val)
        PDEBUG(D_V4L2, "Read vertical flip %d", *val);
 
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -326,7 +361,7 @@ int s5k4aa_set_vflip(struct gspca_dev *gspca_dev, __s32 val)
                err = s5k4aa_write_sensor(sd, S5K4AA_ROWSTART_LO, &data, 1);
        }
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
@@ -343,7 +378,7 @@ int s5k4aa_get_hflip(struct gspca_dev *gspca_dev, __s32 *val)
        *val = (data & S5K4AA_RM_H_FLIP) >> 6;
        PDEBUG(D_V4L2, "Read horizontal flip %d", *val);
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
@@ -382,7 +417,7 @@ int s5k4aa_set_hflip(struct gspca_dev *gspca_dev, __s32 val)
                err = s5k4aa_write_sensor(sd, S5K4AA_COLSTART_LO, &data, 1);
        }
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
@@ -400,7 +435,7 @@ int s5k4aa_get_gain(struct gspca_dev *gspca_dev, __s32 *val)
        PDEBUG(D_V4L2, "Read gain %d", *val);
 
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
 int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val)
@@ -418,10 +453,10 @@ int s5k4aa_set_gain(struct gspca_dev *gspca_dev, __s32 val)
        err = s5k4aa_write_sensor(sd, S5K4AA_GAIN_2, &data, 1);
 
 out:
-       return (err < 0) ? err : 0;
+       return err;
 }
 
-void s5k4aa_dump_registers(struct sd *sd)
+static void s5k4aa_dump_registers(struct sd *sd)
 {
        int address;
        u8 page, old_page;