V4L/DVB (11034): soc-camera: remove now unused gpio member of struct soc_camera_link

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 90a3990..6112740 100644 (file)
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -421,7 +421,6 @@ static unsigned long pcm990_camera_query_bus_param(struct soc_camera_link *link)
 
 static struct soc_camera_link iclink = {
        .bus_id = 0, /* Must match with the camera ID above */
 
 static struct soc_camera_link iclink = {
        .bus_id = 0, /* Must match with the camera ID above */

-       .gpio = NR_BUILTIN_GPIO + 1,

        .query_bus_param = pcm990_camera_query_bus_param,
        .set_bus_param = pcm990_camera_set_bus_param,
 };
        .query_bus_param = pcm990_camera_query_bus_param,
        .set_bus_param = pcm990_camera_set_bus_param,
 };

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index b44fa09..3701368 100644 (file)
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -95,8 +95,6 @@ struct soc_camera_host_ops {
 struct soc_camera_link {
        /* Camera bus id, used to match a camera and a bus */
        int bus_id;
 struct soc_camera_link {
        /* Camera bus id, used to match a camera and a bus */
        int bus_id;

-       /* GPIO number to switch between 8 and 10 bit modes */
-       unsigned int gpio;

        /* Per camera SOCAM_SENSOR_* bus flags */
        unsigned long flags;
        /* Optional callbacks to power on or off and reset the sensor */
        /* Per camera SOCAM_SENSOR_* bus flags */
        unsigned long flags;
        /* Optional callbacks to power on or off and reset the sensor */