aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorSakari Ailus <sakari.ailus@iki.fi>2014-05-03 20:31:56 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-05-23 10:31:19 -0400
commit9945374e6d2ff63efe903dedb3d04f18c18efafc (patch)
tree93d69eb848de7a774c3346f046188205bbe4b699 /drivers/media/i2c
parent5fba9888c1303a65bd788b34846867477fac7911 (diff)
[media] smiapp: Check for GPIO validity using gpio_is_valid()
Do not use our special value, SMIAPP_NO_XSHUTDOWN. Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/smiapp/smiapp-core.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index c2165fd6f7f4..8d01711eec4b 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -1128,7 +1128,7 @@ static int smiapp_power_on(struct smiapp_sensor *sensor)
1128 } 1128 }
1129 usleep_range(1000, 1000); 1129 usleep_range(1000, 1000);
1130 1130
1131 if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) 1131 if (gpio_is_valid(sensor->platform_data->xshutdown))
1132 gpio_set_value(sensor->platform_data->xshutdown, 1); 1132 gpio_set_value(sensor->platform_data->xshutdown, 1);
1133 1133
1134 sleep = SMIAPP_RESET_DELAY(sensor->platform_data->ext_clk); 1134 sleep = SMIAPP_RESET_DELAY(sensor->platform_data->ext_clk);
@@ -1238,7 +1238,7 @@ static int smiapp_power_on(struct smiapp_sensor *sensor)
1238 return 0; 1238 return 0;
1239 1239
1240out_cci_addr_fail: 1240out_cci_addr_fail:
1241 if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) 1241 if (gpio_is_valid(sensor->platform_data->xshutdown))
1242 gpio_set_value(sensor->platform_data->xshutdown, 0); 1242 gpio_set_value(sensor->platform_data->xshutdown, 0);
1243 if (sensor->platform_data->set_xclk) 1243 if (sensor->platform_data->set_xclk)
1244 sensor->platform_data->set_xclk(&sensor->src->sd, 0); 1244 sensor->platform_data->set_xclk(&sensor->src->sd, 0);
@@ -1264,7 +1264,7 @@ static void smiapp_power_off(struct smiapp_sensor *sensor)
1264 SMIAPP_REG_U8_SOFTWARE_RESET, 1264 SMIAPP_REG_U8_SOFTWARE_RESET,
1265 SMIAPP_SOFTWARE_RESET); 1265 SMIAPP_SOFTWARE_RESET);
1266 1266
1267 if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) 1267 if (gpio_is_valid(sensor->platform_data->xshutdown))
1268 gpio_set_value(sensor->platform_data->xshutdown, 0); 1268 gpio_set_value(sensor->platform_data->xshutdown, 0);
1269 if (sensor->platform_data->set_xclk) 1269 if (sensor->platform_data->set_xclk)
1270 sensor->platform_data->set_xclk(&sensor->src->sd, 0); 1270 sensor->platform_data->set_xclk(&sensor->src->sd, 0);
@@ -2378,7 +2378,7 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
2378 } 2378 }
2379 } 2379 }
2380 2380
2381 if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) { 2381 if (gpio_is_valid(sensor->platform_data->xshutdown)) {
2382 if (devm_gpio_request_one(&client->dev, 2382 if (devm_gpio_request_one(&client->dev,
2383 sensor->platform_data->xshutdown, 0, 2383 sensor->platform_data->xshutdown, 0,
2384 "SMIA++ xshutdown") != 0) { 2384 "SMIA++ xshutdown") != 0) {
@@ -2830,7 +2830,7 @@ static int smiapp_remove(struct i2c_client *client)
2830 unsigned int i; 2830 unsigned int i;
2831 2831
2832 if (sensor->power_count) { 2832 if (sensor->power_count) {
2833 if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) 2833 if (gpio_is_valid(sensor->platform_data->xshutdown))
2834 gpio_set_value(sensor->platform_data->xshutdown, 0); 2834 gpio_set_value(sensor->platform_data->xshutdown, 0);
2835 if (sensor->platform_data->set_xclk) 2835 if (sensor->platform_data->set_xclk)
2836 sensor->platform_data->set_xclk(&sensor->src->sd, 0); 2836 sensor->platform_data->set_xclk(&sensor->src->sd, 0);