[media] v4l2-ctrls: increase internal min/max/step/def to 64 bit

[deliverable/linux.git] / drivers / media / i2c / smiapp / smiapp-core.c

diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index c2165fd6f7f442a85480254f622a73ee1f1bddcd..72350f0befc509c3e97c96ea42f1b69578662976 100644 (file)
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -533,7 +533,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
 
        sensor->pixel_rate_parray = v4l2_ctrl_new_std(
                &sensor->pixel_array->ctrl_handler, &smiapp_ctrl_ops,
-               V4L2_CID_PIXEL_RATE, 0, 0, 1, 0);
+               V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1);
 
        if (sensor->pixel_array->ctrl_handler.error) {
                dev_err(&client->dev,
@@ -562,7 +562,7 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
 
        sensor->pixel_rate_csi = v4l2_ctrl_new_std(
                &sensor->src->ctrl_handler, &smiapp_ctrl_ops,
-               V4L2_CID_PIXEL_RATE, 0, 0, 1, 0);
+               V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1);
 
        if (sensor->src->ctrl_handler.error) {
                dev_err(&client->dev,
@@ -1128,7 +1128,7 @@ static int smiapp_power_on(struct smiapp_sensor *sensor)
        }
        usleep_range(1000, 1000);
 
-       if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN)
+       if (gpio_is_valid(sensor->platform_data->xshutdown))
                gpio_set_value(sensor->platform_data->xshutdown, 1);
 
        sleep = SMIAPP_RESET_DELAY(sensor->platform_data->ext_clk);
@@ -1238,7 +1238,7 @@ static int smiapp_power_on(struct smiapp_sensor *sensor)
        return 0;
 
 out_cci_addr_fail:
-       if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN)
+       if (gpio_is_valid(sensor->platform_data->xshutdown))
                gpio_set_value(sensor->platform_data->xshutdown, 0);
        if (sensor->platform_data->set_xclk)
                sensor->platform_data->set_xclk(&sensor->src->sd, 0);
@@ -1264,7 +1264,7 @@ static void smiapp_power_off(struct smiapp_sensor *sensor)
                             SMIAPP_REG_U8_SOFTWARE_RESET,
                             SMIAPP_SOFTWARE_RESET);
 
-       if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN)
+       if (gpio_is_valid(sensor->platform_data->xshutdown))
                gpio_set_value(sensor->platform_data->xshutdown, 0);
        if (sensor->platform_data->set_xclk)
                sensor->platform_data->set_xclk(&sensor->src->sd, 0);
@@ -2358,14 +2358,14 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
        sensor->vana = devm_regulator_get(&client->dev, "vana");
        if (IS_ERR(sensor->vana)) {
                dev_err(&client->dev, "could not get regulator for vana\n");
-               return -ENODEV;
+               return PTR_ERR(sensor->vana);
        }
 
        if (!sensor->platform_data->set_xclk) {
                sensor->ext_clk = devm_clk_get(&client->dev, "ext_clk");
                if (IS_ERR(sensor->ext_clk)) {
                        dev_err(&client->dev, "could not get clock\n");
-                       return -ENODEV;
+                       return PTR_ERR(sensor->ext_clk);
                }
 
                rval = clk_set_rate(sensor->ext_clk,
@@ -2374,18 +2374,19 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                        dev_err(&client->dev,
                                "unable to set clock freq to %u\n",
                                sensor->platform_data->ext_clk);
-                       return -ENODEV;
+                       return rval;
                }
        }
 
-       if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN) {
-               if (devm_gpio_request_one(&client->dev,
-                                         sensor->platform_data->xshutdown, 0,
-                                         "SMIA++ xshutdown") != 0) {
+       if (gpio_is_valid(sensor->platform_data->xshutdown)) {
+               rval = devm_gpio_request_one(
+                       &client->dev, sensor->platform_data->xshutdown, 0,
+                       "SMIA++ xshutdown");
+               if (rval < 0) {
                        dev_err(&client->dev,
                                "unable to acquire reset gpio %d\n",
                                sensor->platform_data->xshutdown);
-                       return -ENODEV;
+                       return rval;
                }
        }
 
@@ -2543,9 +2544,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                }
 
                snprintf(this->sd.name,
-                        sizeof(this->sd.name), "%s %d-%4.4x %s",
-                        sensor->minfo.name, i2c_adapter_id(client->adapter),
-                        client->addr, _this->name);
+                        sizeof(this->sd.name), "%s %s %d-%4.4x",
+                        sensor->minfo.name, _this->name,
+                        i2c_adapter_id(client->adapter), client->addr);
 
                this->sink_fmt.width =
                        sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
@@ -2830,7 +2831,7 @@ static int smiapp_remove(struct i2c_client *client)
        unsigned int i;
 
        if (sensor->power_count) {
-               if (sensor->platform_data->xshutdown != SMIAPP_NO_XSHUTDOWN)
+               if (gpio_is_valid(sensor->platform_data->xshutdown))
                        gpio_set_value(sensor->platform_data->xshutdown, 0);
                if (sensor->platform_data->set_xclk)
                        sensor->platform_data->set_xclk(&sensor->src->sd, 0);