|
@@ -58,7 +58,7 @@ struct ad5820_device {
|
|
struct mutex power_lock;
|
|
struct mutex power_lock;
|
|
int power_count;
|
|
int power_count;
|
|
|
|
|
|
- unsigned int standby : 1;
|
|
|
|
|
|
+ bool standby;
|
|
};
|
|
};
|
|
|
|
|
|
static int ad5820_write(struct ad5820_device *coil, u16 data)
|
|
static int ad5820_write(struct ad5820_device *coil, u16 data)
|
|
@@ -108,7 +108,7 @@ static int ad5820_update_hw(struct ad5820_device *coil)
|
|
/*
|
|
/*
|
|
* Power handling
|
|
* Power handling
|
|
*/
|
|
*/
|
|
-static int ad5820_power_off(struct ad5820_device *coil, int standby)
|
|
|
|
|
|
+static int ad5820_power_off(struct ad5820_device *coil, bool standby)
|
|
{
|
|
{
|
|
int ret = 0, ret2;
|
|
int ret = 0, ret2;
|
|
|
|
|
|
@@ -117,7 +117,7 @@ static int ad5820_power_off(struct ad5820_device *coil, int standby)
|
|
* (single power line control for both coil and sensor).
|
|
* (single power line control for both coil and sensor).
|
|
*/
|
|
*/
|
|
if (standby) {
|
|
if (standby) {
|
|
- coil->standby = 1;
|
|
|
|
|
|
+ coil->standby = true;
|
|
ret = ad5820_update_hw(coil);
|
|
ret = ad5820_update_hw(coil);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -127,7 +127,7 @@ static int ad5820_power_off(struct ad5820_device *coil, int standby)
|
|
return ret2;
|
|
return ret2;
|
|
}
|
|
}
|
|
|
|
|
|
-static int ad5820_power_on(struct ad5820_device *coil, int restore)
|
|
|
|
|
|
+static int ad5820_power_on(struct ad5820_device *coil, bool restore)
|
|
{
|
|
{
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
@@ -137,7 +137,7 @@ static int ad5820_power_on(struct ad5820_device *coil, int restore)
|
|
|
|
|
|
if (restore) {
|
|
if (restore) {
|
|
/* Restore the hardware settings. */
|
|
/* Restore the hardware settings. */
|
|
- coil->standby = 0;
|
|
|
|
|
|
+ coil->standby = false;
|
|
ret = ad5820_update_hw(coil);
|
|
ret = ad5820_update_hw(coil);
|
|
if (ret)
|
|
if (ret)
|
|
goto fail;
|
|
goto fail;
|
|
@@ -145,7 +145,7 @@ static int ad5820_power_on(struct ad5820_device *coil, int restore)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
fail:
|
|
fail:
|
|
- coil->standby = 1;
|
|
|
|
|
|
+ coil->standby = true;
|
|
regulator_disable(coil->vana);
|
|
regulator_disable(coil->vana);
|
|
|
|
|
|
return ret;
|
|
return ret;
|
|
@@ -227,7 +227,8 @@ ad5820_set_power(struct v4l2_subdev *subdev, int on)
|
|
* update the power state.
|
|
* update the power state.
|
|
*/
|
|
*/
|
|
if (coil->power_count == !on) {
|
|
if (coil->power_count == !on) {
|
|
- ret = on ? ad5820_power_on(coil, 1) : ad5820_power_off(coil, 1);
|
|
|
|
|
|
+ ret = on ? ad5820_power_on(coil, true) :
|
|
|
|
+ ad5820_power_off(coil, true);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
goto done;
|
|
goto done;
|
|
}
|
|
}
|
|
@@ -279,7 +280,7 @@ static int ad5820_suspend(struct device *dev)
|
|
if (!coil->power_count)
|
|
if (!coil->power_count)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- return ad5820_power_off(coil, 0);
|
|
|
|
|
|
+ return ad5820_power_off(coil, false);
|
|
}
|
|
}
|
|
|
|
|
|
static int ad5820_resume(struct device *dev)
|
|
static int ad5820_resume(struct device *dev)
|
|
@@ -291,7 +292,7 @@ static int ad5820_resume(struct device *dev)
|
|
if (!coil->power_count)
|
|
if (!coil->power_count)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- return ad5820_power_on(coil, 1);
|
|
|
|
|
|
+ return ad5820_power_on(coil, true);
|
|
}
|
|
}
|
|
|
|
|
|
#else
|
|
#else
|