2007-06-02 19:09:50

by Adrian Bunk

Subject: [2.6 patch] remove sonypi_camera_command()

This patch removes the no longer used sonypi_camera_command().

Signed-off-by: Adrian Bunk <[email protected]>

---

drivers/char/sonypi.c | 47 -----------------------------------------
include/linux/sonypi.h | 2 -
2 files changed, 49 deletions(-)

--- linux-2.6.22-rc3-mm1/include/linux/sonypi.h.old 2007-06-02 20:35:45.000000000 +0200
+++ linux-2.6.22-rc3-mm1/include/linux/sonypi.h 2007-06-02 20:35:51.000000000 +0200
@@ -153,8 +153,6 @@
#define SONYPI_COMMAND_GETCAMERAROMVERSION 18 /* obsolete */
#define SONYPI_COMMAND_GETCAMERAREVISION 19 /* obsolete */

-int sonypi_camera_command(int command, u8 value);
-
#endif /* __KERNEL__ */

#endif /* _SONYPI_H_ */
--- linux-2.6.22-rc3-mm1/drivers/char/sonypi.c.old 2007-06-02 20:35:58.000000000 +0200
+++ linux-2.6.22-rc3-mm1/drivers/char/sonypi.c 2007-06-02 20:36:16.000000000 +0200
@@ -885,53 +885,6 @@
return IRQ_HANDLED;
}

-/* External camera command (exported to the motion eye v4l driver) */
-int sonypi_camera_command(int command, u8 value)
-{
- if (!camera)
- return -EIO;
-
- mutex_lock(&sonypi_device.lock);
-
- switch (command) {
- case SONYPI_COMMAND_SETCAMERA:
- if (value)
- sonypi_camera_on();
- else
- sonypi_camera_off();
- break;
- case SONYPI_COMMAND_SETCAMERABRIGHTNESS:
- sonypi_set(SONYPI_CAMERA_BRIGHTNESS, value);
- break;
- case SONYPI_COMMAND_SETCAMERACONTRAST:
- sonypi_set(SONYPI_CAMERA_CONTRAST, value);
- break;
- case SONYPI_COMMAND_SETCAMERAHUE:
- sonypi_set(SONYPI_CAMERA_HUE, value);
- break;
- case SONYPI_COMMAND_SETCAMERACOLOR:
- sonypi_set(SONYPI_CAMERA_COLOR, value);
- break;
- case SONYPI_COMMAND_SETCAMERASHARPNESS:
- sonypi_set(SONYPI_CAMERA_SHARPNESS, value);
- break;
- case SONYPI_COMMAND_SETCAMERAPICTURE:
- sonypi_set(SONYPI_CAMERA_PICTURE, value);
- break;
- case SONYPI_COMMAND_SETCAMERAAGC:
- sonypi_set(SONYPI_CAMERA_AGC, value);
- break;
- default:
- printk(KERN_ERR "sonypi: sonypi_camera_command invalid: %d\n",
- command);
- break;
- }
- mutex_unlock(&sonypi_device.lock);
- return 0;
-}
-
-EXPORT_SYMBOL(sonypi_camera_command);
-
static int sonypi_misc_fasync(int fd, struct file *filp, int on)
{
int retval;

2007-06-03 03:56:20

by Mattia Dongili

Subject: Re: [2.6 patch] remove sonypi_camera_command()

On Sat, Jun 02, 2007 at 09:09:42PM +0200, Adrian Bunk wrote:
> This patch removes the no longer used sonypi_camera_command().
>
> Signed-off-by: Adrian Bunk <[email protected]>

Signed-off-by: Mattia Dongili <[email protected]>

>
> ---
>
> drivers/char/sonypi.c | 47 -----------------------------------------
> include/linux/sonypi.h | 2 -
> 2 files changed, 49 deletions(-)
>
> --- linux-2.6.22-rc3-mm1/include/linux/sonypi.h.old 2007-06-02 20:35:45.000000000 +0200
> +++ linux-2.6.22-rc3-mm1/include/linux/sonypi.h 2007-06-02 20:35:51.000000000 +0200
> @@ -153,8 +153,6 @@
> #define SONYPI_COMMAND_GETCAMERAROMVERSION 18 /* obsolete */
> #define SONYPI_COMMAND_GETCAMERAREVISION 19 /* obsolete */
>
> -int sonypi_camera_command(int command, u8 value);
> -
> #endif /* __KERNEL__ */
>
> #endif /* _SONYPI_H_ */
> --- linux-2.6.22-rc3-mm1/drivers/char/sonypi.c.old 2007-06-02 20:35:58.000000000 +0200
> +++ linux-2.6.22-rc3-mm1/drivers/char/sonypi.c 2007-06-02 20:36:16.000000000 +0200
> @@ -885,53 +885,6 @@
> return IRQ_HANDLED;
> }
>
> -/* External camera command (exported to the motion eye v4l driver) */
> -int sonypi_camera_command(int command, u8 value)
> -{
> - if (!camera)
> - return -EIO;
> -
> - mutex_lock(&sonypi_device.lock);
> -
> - switch (command) {
> - case SONYPI_COMMAND_SETCAMERA:
> - if (value)
> - sonypi_camera_on();
> - else
> - sonypi_camera_off();
> - break;
> - case SONYPI_COMMAND_SETCAMERABRIGHTNESS:
> - sonypi_set(SONYPI_CAMERA_BRIGHTNESS, value);
> - break;
> - case SONYPI_COMMAND_SETCAMERACONTRAST:
> - sonypi_set(SONYPI_CAMERA_CONTRAST, value);
> - break;
> - case SONYPI_COMMAND_SETCAMERAHUE:
> - sonypi_set(SONYPI_CAMERA_HUE, value);
> - break;
> - case SONYPI_COMMAND_SETCAMERACOLOR:
> - sonypi_set(SONYPI_CAMERA_COLOR, value);
> - break;
> - case SONYPI_COMMAND_SETCAMERASHARPNESS:
> - sonypi_set(SONYPI_CAMERA_SHARPNESS, value);
> - break;
> - case SONYPI_COMMAND_SETCAMERAPICTURE:
> - sonypi_set(SONYPI_CAMERA_PICTURE, value);
> - break;
> - case SONYPI_COMMAND_SETCAMERAAGC:
> - sonypi_set(SONYPI_CAMERA_AGC, value);
> - break;
> - default:
> - printk(KERN_ERR "sonypi: sonypi_camera_command invalid: %d\n",
> - command);
> - break;
> - }
> - mutex_unlock(&sonypi_device.lock);
> - return 0;
> -}
> -
> -EXPORT_SYMBOL(sonypi_camera_command);
> -
> static int sonypi_misc_fasync(int fd, struct file *filp, int on)
> {
> int retval;
>
>
--
mattia
:wq!