merge by hand - fix up rejections in Documentation/DocBook/Makefile

7 files changed, 51 insertions, 57 deletions

diff --git a/drivers/usb/media/ov511.c b/drivers/usb/media/ov511.c
index d6051822416e..036c485d1d1e 100644
--- a/drivers/usb/media/ov511.c
+++ b/drivers/usb/media/ov511.c
@@ -5041,7 +5041,7 @@ ov6xx0_configure(struct usb_ov511 *ov)
                 { OV511_I2C_BUS, 0x2a, 0x04 }, /* Disable framerate adjust */
 //              { OV511_I2C_BUS, 0x2b, 0xac }, /* Framerate; Set 2a[7] first */
                 { OV511_I2C_BUS, 0x2d, 0x99 },
-                { OV511_I2C_BUS, 0x33, 0xa0 }, /* Color Procesing Parameter */
+                { OV511_I2C_BUS, 0x33, 0xa0 }, /* Color Processing Parameter */
                 { OV511_I2C_BUS, 0x34, 0xd2 }, /* Max A/D range */
                 { OV511_I2C_BUS, 0x38, 0x8b },
                 { OV511_I2C_BUS, 0x39, 0x40 },
diff --git a/drivers/usb/media/pwc/pwc-ctrl.c b/drivers/usb/media/pwc/pwc-ctrl.c
index 26aa914bc541..42ec468d52d6 100644
--- a/drivers/usb/media/pwc/pwc-ctrl.c
+++ b/drivers/usb/media/pwc/pwc-ctrl.c
@@ -418,6 +418,44 @@ static inline int set_video_mode_Kiara(struct pwc_device *pdev, int size, int fr
 
 
 
+static void pwc_set_image_buffer_size(struct pwc_device *pdev)
+{
+        int i, factor = 0, filler = 0;
+
+        /* for PALETTE_YUV420P */
+        switch(pdev->vpalette)
+        {
+        case VIDEO_PALETTE_YUV420P:
+                factor = 6;
+                filler = 128;
+                break;
+        case VIDEO_PALETTE_RAW:
+                factor = 6; /* can be uncompressed YUV420P */
+                filler = 0;
+                break;
+        }
+
+        /* Set sizes in bytes */
+        pdev->image.size = pdev->image.x * pdev->image.y * factor / 4;
+        pdev->view.size  = pdev->view.x  * pdev->view.y  * factor / 4;
+
+        /* Align offset, or you'll get some very weird results in
+           YUV420 mode... x must be multiple of 4 (to get the Y's in
+           place), and y even (or you'll mixup U & V). This is less of a
+           problem for YUV420P.
+         */
+        pdev->offset.x = ((pdev->view.x - pdev->image.x) / 2) & 0xFFFC;
+        pdev->offset.y = ((pdev->view.y - pdev->image.y) / 2) & 0xFFFE;
+
+        /* Fill buffers with gray or black */
+        for (i = 0; i < MAX_IMAGES; i++) {
+                if (pdev->image_ptr[i] != NULL)
+                        memset(pdev->image_ptr[i], filler, pdev->view.size);
+        }
+}
+
+
+
 /**
    @pdev: device structure
    @width: viewport width
@@ -475,44 +513,6 @@ int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frame
 }
 
 
-void pwc_set_image_buffer_size(struct pwc_device *pdev)
-{
-        int i, factor = 0, filler = 0;
-
-        /* for PALETTE_YUV420P */
-        switch(pdev->vpalette)
-        {
-        case VIDEO_PALETTE_YUV420P:
-                factor = 6;
-                filler = 128;
-                break;
-        case VIDEO_PALETTE_RAW:
-                factor = 6; /* can be uncompressed YUV420P */
-                filler = 0;
-                break;
-        }
-
-        /* Set sizes in bytes */
-        pdev->image.size = pdev->image.x * pdev->image.y * factor / 4;
-        pdev->view.size  = pdev->view.x  * pdev->view.y  * factor / 4;
-
-        /* Align offset, or you'll get some very weird results in
-           YUV420 mode... x must be multiple of 4 (to get the Y's in
-           place), and y even (or you'll mixup U & V). This is less of a
-           problem for YUV420P.
-         */
-        pdev->offset.x = ((pdev->view.x - pdev->image.x) / 2) & 0xFFFC;
-        pdev->offset.y = ((pdev->view.y - pdev->image.y) / 2) & 0xFFFE;
-
-        /* Fill buffers with gray or black */
-        for (i = 0; i < MAX_IMAGES; i++) {
-                if (pdev->image_ptr[i] != NULL)
-                        memset(pdev->image_ptr[i], filler, pdev->view.size);
-        }
-}
-
-
-
 /* BRIGHTNESS */
 
 int pwc_get_brightness(struct pwc_device *pdev)
@@ -949,7 +949,7 @@ int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value)
         return SendControlMsg(SET_STATUS_CTL, LED_FORMATTER, 2);
 }
 
-int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
+static int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value)
 {
         unsigned char buf[2];
         int ret;
@@ -1100,7 +1100,7 @@ static inline int pwc_mpt_set_angle(struct pwc_device *pdev, int pan, int tilt)
         unsigned char buf[4];
         
         /* set new relative angle; angles are expressed in degrees * 100,
-           but cam as .5 degree resolution, hence devide by 200. Also
+           but cam as .5 degree resolution, hence divide by 200. Also
            the angle must be multiplied by 64 before it's send to
            the cam (??)
          */
diff --git a/drivers/usb/media/pwc/pwc-if.c b/drivers/usb/media/pwc/pwc-if.c
index 100a5a4f03a3..cca47f480a8b 100644
--- a/drivers/usb/media/pwc/pwc-if.c
+++ b/drivers/usb/media/pwc/pwc-if.c
@@ -129,7 +129,7 @@ static int default_mbufs = 2;	/* Default number of mmap() buffers */
        int pwc_trace = TRACE_MODULE | TRACE_FLOW | TRACE_PWCX;
 static int power_save = 0;
 static int led_on = 100, led_off = 0; /* defaults to LED that is on while in use */
-       int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */
+static int pwc_preferred_compression = 2; /* 0..3 = uncompressed..high */
 static struct {
         int type;
         char serial_number[30];
@@ -272,7 +272,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
                 return -ENXIO;
         }
 #endif  
-        /* Allocate Isochronuous pipe buffers */
+        /* Allocate Isochronous pipe buffers */
         for (i = 0; i < MAX_ISO_BUFS; i++) {
                 if (pdev->sbuf[i].data == NULL) {
                         kbuf = kmalloc(ISO_BUFFER_SIZE, GFP_KERNEL);
@@ -322,7 +322,7 @@ static int pwc_allocate_buffers(struct pwc_device *pdev)
           case 730:
           case 740:
           case 750:
-            Trace(TRACE_MEMORY,"private_data(%Zd)\n",sizeof(struct pwc_dec23_private));
+            Trace(TRACE_MEMORY,"private_data(%zu)\n",sizeof(struct pwc_dec23_private));
             kbuf = kmalloc(sizeof(struct pwc_dec23_private), GFP_KERNEL);       /* Timon & Kiara */
             break;
           case 645:
@@ -850,7 +850,7 @@ static int pwc_isoc_init(struct pwc_device *pdev)
         
         if (pdev->vmax_packet_size < 0 || pdev->vmax_packet_size > ISO_MAX_FRAME_SIZE) {
                 Err("Failed to find packet size for video endpoint in current alternate setting.\n");
-                return -ENFILE; /* Odd error, that should be noticable */
+                return -ENFILE; /* Odd error, that should be noticeable */
         }
 
         /* Set alternate interface */
@@ -1179,7 +1179,7 @@ static ssize_t pwc_video_read(struct file *file, char __user * buf,
         DECLARE_WAITQUEUE(wait, current);
         int bytes_to_read;
 
-        Trace(TRACE_READ, "video_read(0x%p, %p, %Zd) called.\n", vdev, buf, count);
+        Trace(TRACE_READ, "video_read(0x%p, %p, %zu) called.\n", vdev, buf, count);
         if (vdev == NULL)
                 return -EFAULT;
         pdev = vdev->priv;
@@ -2128,7 +2128,7 @@ static int __init usb_pwc_init(void)
         if (leds[1] >= 0)
                 led_off = leds[1];
 
-        /* Big device node whoopla. Basicly, it allows you to assign a
+        /* Big device node whoopla. Basically, it allows you to assign a
            device node (/dev/videoX) to a camera, based on its type
            & serial number. The format is [type[.serialnumber]:]node.
 
diff --git a/drivers/usb/media/pwc/pwc-ioctl.h b/drivers/usb/media/pwc/pwc-ioctl.h
index 65805eaa9a1c..5f9cb08bc02e 100644
--- a/drivers/usb/media/pwc/pwc-ioctl.h
+++ b/drivers/usb/media/pwc/pwc-ioctl.h
@@ -75,7 +75,7 @@
 #define PWC_FPS_SNAPSHOT        0x00400000
 
 
-/* structure for transfering x & y coordinates */
+/* structure for transferring x & y coordinates */
 struct pwc_coord
 {
         int x, y;               /* guess what */
diff --git a/drivers/usb/media/pwc/pwc.h b/drivers/usb/media/pwc/pwc.h
index 53b516d29cf5..267869dab185 100644
--- a/drivers/usb/media/pwc/pwc.h
+++ b/drivers/usb/media/pwc/pwc.h
@@ -226,9 +226,8 @@ struct pwc_device
 extern "C" {
 #endif
 
-/* Global variables */
+/* Global variable */
 extern int pwc_trace;
-extern int pwc_preferred_compression;
 
 /** functions in pwc-if.c */
 int pwc_try_video_mode(struct pwc_device *pdev, int width, int height, int new_fps, int new_compression, int new_snapshot);
@@ -243,8 +242,6 @@ void pwc_construct(struct pwc_device *pdev);
 /** Functions in pwc-ctrl.c */
 /* Request a certain video mode. Returns < 0 if not possible */
 extern int pwc_set_video_mode(struct pwc_device *pdev, int width, int height, int frames, int compression, int snapshot);
-/* Calculate the number of bytes per image (not frame) */
-extern void pwc_set_image_buffer_size(struct pwc_device *pdev);
 
 /* Various controls; should be obvious. Value 0..65535, or < 0 on error */
 extern int pwc_get_brightness(struct pwc_device *pdev);
@@ -256,7 +253,6 @@ extern int pwc_set_gamma(struct pwc_device *pdev, int value);
 extern int pwc_get_saturation(struct pwc_device *pdev);
 extern int pwc_set_saturation(struct pwc_device *pdev, int value);
 extern int pwc_set_leds(struct pwc_device *pdev, int on_value, int off_value);
-extern int pwc_get_leds(struct pwc_device *pdev, int *on_value, int *off_value);
 extern int pwc_get_cmos_sensor(struct pwc_device *pdev, int *sensor);
 
 /* Power down or up the camera; not supported by all models */
diff --git a/drivers/usb/media/sn9c102_core.c b/drivers/usb/media/sn9c102_core.c
index 898401cf7dcc..31d57400d5be 100644
--- a/drivers/usb/media/sn9c102_core.c
+++ b/drivers/usb/media/sn9c102_core.c
@@ -429,7 +429,7 @@ sn9c102_i2c_try_read(struct sn9c102_device* cam,
 }
 
 
-int 
+static int 
 sn9c102_i2c_try_write(struct sn9c102_device* cam,
                       struct sn9c102_sensor* sensor, u8 address, u8 value)
 {
@@ -785,7 +785,7 @@ static int sn9c102_stop_transfer(struct sn9c102_device* cam)
 }
 
 
-int sn9c102_stream_interrupt(struct sn9c102_device* cam)
+static int sn9c102_stream_interrupt(struct sn9c102_device* cam)
 {
         int err = 0;
 
diff --git a/drivers/usb/media/sn9c102_sensor.h b/drivers/usb/media/sn9c102_sensor.h
index 16f7483559f0..6a7adebcb4bf 100644
--- a/drivers/usb/media/sn9c102_sensor.h
+++ b/drivers/usb/media/sn9c102_sensor.h
@@ -145,8 +145,6 @@ static const struct usb_device_id sn9c102_id_table[] = {                      \
 */
 
 /* The "try" I2C I/O versions are used when probing the sensor */
-extern int sn9c102_i2c_try_write(struct sn9c102_device*,struct sn9c102_sensor*,
-                                 u8 address, u8 value);
 extern int sn9c102_i2c_try_read(struct sn9c102_device*,struct sn9c102_sensor*,
                                 u8 address);