leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB (7217): Replace NO_GPIO with gpio_is_valid()

Browse Source 
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>
This commit is contained in:
Guennadi Liakhovetski 2008-04-22 14:42:08 -03:00 committed by Mauro Carvalho Chehab
parent 12afe37818
commit b4333a3bae
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/mt9m001.c
View File

@ -154,7 +154,7 @@ static int bus_switch_request(struct mt9m001 *mt9m001,
int ret;
unsigned int gpio = icl->gpio;
if (gpio != NO_GPIO) {
if (gpio_is_valid(gpio)) {
/* We have a data bus switch. */
ret = gpio_request(gpio, "mt9m001");
if (ret < 0) {
@ -174,7 +174,7 @@ static int bus_switch_request(struct mt9m001 *mt9m001,
mt9m001->switch_gpio = gpio;
#else
mt9m001->switch_gpio = NO_GPIO;
mt9m001->switch_gpio = -EINVAL;
#endif
return 0;
}
@ -182,7 +182,7 @@ static int bus_switch_request(struct mt9m001 *mt9m001,
static void bus_switch_release(struct mt9m001 *mt9m001)
{
#ifdef CONFIG_MT9M001_PCA9536_SWITCH
if (mt9m001->switch_gpio != NO_GPIO)
if (gpio_is_valid(mt9m001->switch_gpio))
gpio_free(mt9m001->switch_gpio);
#endif
}
@ -190,7 +190,7 @@ static void bus_switch_release(struct mt9m001 *mt9m001)
static int bus_switch_act(struct mt9m001 *mt9m001, int go8bit)
{
#ifdef CONFIG_MT9M001_PCA9536_SWITCH
if (mt9m001->switch_gpio == NO_GPIO)
if (!gpio_is_valid(mt9m001->switch_gpio))
return -ENODEV;
gpio_set_value_cansleep(mt9m001->switch_gpio, go8bit);
@ -224,7 +224,7 @@ static int mt9m001_set_capture_format(struct soc_camera_device *icd,
(mt9m001->datawidth != 9 && (width_flag == IS_DATAWIDTH_9)) ||
(mt9m001->datawidth != 8 && (width_flag == IS_DATAWIDTH_8))) {
/* data width switch requested */
if (mt9m001->switch_gpio == NO_GPIO)
if (!gpio_is_valid(mt9m001->switch_gpio))
return -EINVAL;
/* Well, we actually only can do 10 or 8 bits... */

10
drivers/media/video/mt9v022.c
View File

@ -187,7 +187,7 @@ static int bus_switch_request(struct mt9v022 *mt9v022, struct soc_camera_link *i
int ret;
unsigned int gpio = icl->gpio;
if (gpio != NO_GPIO) {
if (gpio_is_valid(gpio)) {
/* We have a data bus switch. */
ret = gpio_request(gpio, "mt9v022");
if (ret < 0) {
@ -206,7 +206,7 @@ static int bus_switch_request(struct mt9v022 *mt9v022, struct soc_camera_link *i
mt9v022->switch_gpio = gpio;
#else
mt9v022->switch_gpio = NO_GPIO;
mt9v022->switch_gpio = -EINVAL;
#endif
return 0;
}
@ -214,7 +214,7 @@ static int bus_switch_request(struct mt9v022 *mt9v022, struct soc_camera_link *i
static void bus_switch_release(struct mt9v022 *mt9v022)
{
#ifdef CONFIG_MT9V022_PCA9536_SWITCH
if (mt9v022->switch_gpio != NO_GPIO)
if (gpio_is_valid(mt9v022->switch_gpio))
gpio_free(mt9v022->switch_gpio);
#endif
}
@ -222,7 +222,7 @@ static void bus_switch_release(struct mt9v022 *mt9v022)
static int bus_switch_act(struct mt9v022 *mt9v022, int go8bit)
{
#ifdef CONFIG_MT9V022_PCA9536_SWITCH
if (mt9v022->switch_gpio == NO_GPIO)
if (!gpio_is_valid(mt9v022->switch_gpio))
return -ENODEV;
gpio_set_value_cansleep(mt9v022->switch_gpio, go8bit);
@ -303,7 +303,7 @@ static int mt9v022_set_capture_format(struct soc_camera_device *icd,
(mt9v022->datawidth != 9 && (width_flag == IS_DATAWIDTH_9)) ||
(mt9v022->datawidth != 8 && (width_flag == IS_DATAWIDTH_8))) {
/* data width switch requested */
if (mt9v022->switch_gpio == NO_GPIO)
if (!gpio_is_valid(mt9v022->switch_gpio))
return -EINVAL;
/* Well, we actually only can do 10 or 8 bits... */