diff options
author | Guennadi Liakhovetski <g.liakhovetski@pengutronix.de> | 2008-04-22 13:42:08 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:43 -0400 |
commit | b4333a3baecfeee35317c03cf08952cc04bd149a (patch) | |
tree | e3d779aab6705f9bab22b8381be76f310ac832b4 /drivers/media/video/mt9v022.c | |
parent | 12afe3781870cad7b6bbe83a2f8c4dd9ec7bf214 (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/mt9v022.c')
-rw-r--r-- | drivers/media/video/mt9v022.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/mt9v022.c b/drivers/media/video/mt9v022.c index 9b406e41902a..5fbeaa305f35 100644 --- a/drivers/media/video/mt9v022.c +++ b/drivers/media/video/mt9v022.c | |||
@@ -187,7 +187,7 @@ static int bus_switch_request(struct mt9v022 *mt9v022, struct soc_camera_link *i | |||
187 | int ret; | 187 | int ret; |
188 | unsigned int gpio = icl->gpio; | 188 | unsigned int gpio = icl->gpio; |
189 | 189 | ||
190 | if (gpio != NO_GPIO) { | 190 | if (gpio_is_valid(gpio)) { |
191 | /* We have a data bus switch. */ | 191 | /* We have a data bus switch. */ |
192 | ret = gpio_request(gpio, "mt9v022"); | 192 | ret = gpio_request(gpio, "mt9v022"); |
193 | if (ret < 0) { | 193 | if (ret < 0) { |
@@ -206,7 +206,7 @@ static int bus_switch_request(struct mt9v022 *mt9v022, struct soc_camera_link *i | |||
206 | 206 | ||
207 | mt9v022->switch_gpio = gpio; | 207 | mt9v022->switch_gpio = gpio; |
208 | #else | 208 | #else |
209 | mt9v022->switch_gpio = NO_GPIO; | 209 | mt9v022->switch_gpio = -EINVAL; |
210 | #endif | 210 | #endif |
211 | return 0; | 211 | return 0; |
212 | } | 212 | } |
@@ -214,7 +214,7 @@ static int bus_switch_request(struct mt9v022 *mt9v022, struct soc_camera_link *i | |||
214 | static void bus_switch_release(struct mt9v022 *mt9v022) | 214 | static void bus_switch_release(struct mt9v022 *mt9v022) |
215 | { | 215 | { |
216 | #ifdef CONFIG_MT9V022_PCA9536_SWITCH | 216 | #ifdef CONFIG_MT9V022_PCA9536_SWITCH |
217 | if (mt9v022->switch_gpio != NO_GPIO) | 217 | if (gpio_is_valid(mt9v022->switch_gpio)) |
218 | gpio_free(mt9v022->switch_gpio); | 218 | gpio_free(mt9v022->switch_gpio); |
219 | #endif | 219 | #endif |
220 | } | 220 | } |
@@ -222,7 +222,7 @@ static void bus_switch_release(struct mt9v022 *mt9v022) | |||
222 | static int bus_switch_act(struct mt9v022 *mt9v022, int go8bit) | 222 | static int bus_switch_act(struct mt9v022 *mt9v022, int go8bit) |
223 | { | 223 | { |
224 | #ifdef CONFIG_MT9V022_PCA9536_SWITCH | 224 | #ifdef CONFIG_MT9V022_PCA9536_SWITCH |
225 | if (mt9v022->switch_gpio == NO_GPIO) | 225 | if (!gpio_is_valid(mt9v022->switch_gpio)) |
226 | return -ENODEV; | 226 | return -ENODEV; |
227 | 227 | ||
228 | gpio_set_value_cansleep(mt9v022->switch_gpio, go8bit); | 228 | gpio_set_value_cansleep(mt9v022->switch_gpio, go8bit); |
@@ -303,7 +303,7 @@ static int mt9v022_set_capture_format(struct soc_camera_device *icd, | |||
303 | (mt9v022->datawidth != 9 && (width_flag == IS_DATAWIDTH_9)) || | 303 | (mt9v022->datawidth != 9 && (width_flag == IS_DATAWIDTH_9)) || |
304 | (mt9v022->datawidth != 8 && (width_flag == IS_DATAWIDTH_8))) { | 304 | (mt9v022->datawidth != 8 && (width_flag == IS_DATAWIDTH_8))) { |
305 | /* data width switch requested */ | 305 | /* data width switch requested */ |
306 | if (mt9v022->switch_gpio == NO_GPIO) | 306 | if (!gpio_is_valid(mt9v022->switch_gpio)) |
307 | return -EINVAL; | 307 | return -EINVAL; |
308 | 308 | ||
309 | /* Well, we actually only can do 10 or 8 bits... */ | 309 | /* Well, we actually only can do 10 or 8 bits... */ |