aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/mt9m001.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@pengutronix.de>2008-04-22 13:42:08 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 13:07:43 -0400
commitb4333a3baecfeee35317c03cf08952cc04bd149a (patch)
treee3d779aab6705f9bab22b8381be76f310ac832b4 /drivers/media/video/mt9m001.c
parent12afe3781870cad7b6bbe83a2f8c4dd9ec7bf214 (diff)
V4L/DVB (7217): Replace NO_GPIO with gpio_is_valid()
Upon suggestion by David Brownell use a gpio_is_valid() predicate instead of an explicit NO_GPIO macro. The respective patch to include/asm-generic/gpio.h has been accepted upstream. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/mt9m001.c')
-rw-r--r--drivers/media/video/mt9m001.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c
index 3c5867c378d3..b65ff7745b8d 100644
--- a/drivers/media/video/mt9m001.c
+++ b/drivers/media/video/mt9m001.c
@@ -154,7 +154,7 @@ static int bus_switch_request(struct mt9m001 *mt9m001,
154 int ret; 154 int ret;
155 unsigned int gpio = icl->gpio; 155 unsigned int gpio = icl->gpio;
156 156
157 if (gpio != NO_GPIO) { 157 if (gpio_is_valid(gpio)) {
158 /* We have a data bus switch. */ 158 /* We have a data bus switch. */
159 ret = gpio_request(gpio, "mt9m001"); 159 ret = gpio_request(gpio, "mt9m001");
160 if (ret < 0) { 160 if (ret < 0) {
@@ -174,7 +174,7 @@ static int bus_switch_request(struct mt9m001 *mt9m001,
174 174
175 mt9m001->switch_gpio = gpio; 175 mt9m001->switch_gpio = gpio;
176#else 176#else
177 mt9m001->switch_gpio = NO_GPIO; 177 mt9m001->switch_gpio = -EINVAL;
178#endif 178#endif
179 return 0; 179 return 0;
180} 180}
@@ -182,7 +182,7 @@ static int bus_switch_request(struct mt9m001 *mt9m001,
182static void bus_switch_release(struct mt9m001 *mt9m001) 182static void bus_switch_release(struct mt9m001 *mt9m001)
183{ 183{
184#ifdef CONFIG_MT9M001_PCA9536_SWITCH 184#ifdef CONFIG_MT9M001_PCA9536_SWITCH
185 if (mt9m001->switch_gpio != NO_GPIO) 185 if (gpio_is_valid(mt9m001->switch_gpio))
186 gpio_free(mt9m001->switch_gpio); 186 gpio_free(mt9m001->switch_gpio);
187#endif 187#endif
188} 188}
@@ -190,7 +190,7 @@ static void bus_switch_release(struct mt9m001 *mt9m001)
190static int bus_switch_act(struct mt9m001 *mt9m001, int go8bit) 190static int bus_switch_act(struct mt9m001 *mt9m001, int go8bit)
191{ 191{
192#ifdef CONFIG_MT9M001_PCA9536_SWITCH 192#ifdef CONFIG_MT9M001_PCA9536_SWITCH
193 if (mt9m001->switch_gpio == NO_GPIO) 193 if (!gpio_is_valid(mt9m001->switch_gpio))
194 return -ENODEV; 194 return -ENODEV;
195 195
196 gpio_set_value_cansleep(mt9m001->switch_gpio, go8bit); 196 gpio_set_value_cansleep(mt9m001->switch_gpio, go8bit);
@@ -224,7 +224,7 @@ static int mt9m001_set_capture_format(struct soc_camera_device *icd,
224 (mt9m001->datawidth != 9 && (width_flag == IS_DATAWIDTH_9)) || 224 (mt9m001->datawidth != 9 && (width_flag == IS_DATAWIDTH_9)) ||
225 (mt9m001->datawidth != 8 && (width_flag == IS_DATAWIDTH_8))) { 225 (mt9m001->datawidth != 8 && (width_flag == IS_DATAWIDTH_8))) {
226 /* data width switch requested */ 226 /* data width switch requested */
227 if (mt9m001->switch_gpio == NO_GPIO) 227 if (!gpio_is_valid(mt9m001->switch_gpio))
228 return -EINVAL; 228 return -EINVAL;
229 229
230 /* Well, we actually only can do 10 or 8 bits... */ 230 /* Well, we actually only can do 10 or 8 bits... */