regulator: Make virtual consumer use dev_printk
PATCH 1/2 regulator: Make virtual consumer use dev_printk
Signed-off-by Mark Brown <[email protected]>
--- drivers/regulator/virtual.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-)
drivers/regulator/virtual.c +18 -16
@@ -27,17 +27,18 @@ struct virtual_consumer_data {unsigned int mode; }; -static void update_voltage_constraints (struct virtual_consumer_data *data) +static void update_voltage_constraints (struct device *dev, +struct virtual_consumer_data *data) {int ret;if (data->min_uV && data->max_uV && data->min_uV <= data->max_uV) { ret =regulator_set_voltage (data->regulator, - data->min_uV, data->max_uV); + data->min_uV, data->max_uV);if (ret !=0 ) { -printk (KERN_ERR "regulator_set_voltage() failed: %d\n" , - ret); +dev_err (dev, +"regulator_set_voltage() failed: %d\n" , ret);return ; } }
@@ -47,7 +48,7 @@ static void update_voltage_constraints(struct virtual_consumer_data *data)if (ret ==0 ) data->enabled =1 ;else -printk (KERN_ERR "regulator_enable() failed: %d\n" , +dev_err (dev,"regulator_enable() failed: %d\n" , ret); }
@@ -56,13 +57,13 @@ static void update_voltage_constraints(struct virtual_consumer_data *data)if (ret ==0 ) data->enabled =0 ;else -printk (KERN_ERR "regulator_disable() failed: %d\n" , +dev_err (dev,"regulator_disable() failed: %d\n" , ret); } } -static void update_current_limit_constraints (struct virtual_consumer_data - *data) +static void update_current_limit_constraints (struct device *dev, +struct virtual_consumer_data *data) {int ret;
@@ -71,8 +72,9 @@ static void update_current_limit_constraints(struct virtual_consumer_data ret =regulator_set_current_limit (data->regulator, data->min_uA, data->max_uA);if (ret !=0 ) { -pr_err ("regulator_set_current_limit() failed: %d\n" , - ret); +dev_err (dev, +"regulator_set_current_limit() failed: %d\n" , + ret);return ; } }
@@ -82,7 +84,7 @@ static void update_current_limit_constraints(struct virtual_consumer_dataif (ret ==0 ) data->enabled =1 ;else -printk (KERN_ERR "regulator_enable() failed: %d\n" , +dev_err (dev,"regulator_enable() failed: %d\n" , ret); }
@@ -91,7 +93,7 @@ static void update_current_limit_constraints(struct virtual_consumer_dataif (ret ==0 ) data->enabled =0 ;else -printk (KERN_ERR "regulator_disable() failed: %d\n" , +dev_err (dev,"regulator_disable() failed: %d\n" , ret); } }
@@ -115,7 +117,7 @@ static ssize_t set_min_uV(struct device *dev, struct device_attribute *attr,mutex_lock (&data->lock); data->min_uV = val; -update_voltage_constraints (data); +update_voltage_constraints (dev, data);mutex_unlock (&data->lock);
@@ -141,7 +143,7 @@ static ssize_t set_max_uV(struct device *dev, struct device_attribute *attr,mutex_lock (&data->lock); data->max_uV = val; -update_voltage_constraints (data); +update_voltage_constraints (dev, data);mutex_unlock (&data->lock);
@@ -167,7 +169,7 @@ static ssize_t set_min_uA(struct device *dev, struct device_attribute *attr,mutex_lock (&data->lock); data->min_uA = val; -update_current_limit_constraints (data); +update_current_limit_constraints (dev, data);mutex_unlock (&data->lock);
@@ -193,7 +195,7 @@ static ssize_t set_max_uA(struct device *dev, struct device_attribute *attr,mutex_lock (&data->lock); data->max_uA = val; -update_current_limit_constraints (data); +update_current_limit_constraints (dev, data);mutex_unlock (&data->lock);
Signature · 1 line
1.6.3.1
PATCH 2/2 regulator: Make virtual consumer a bit more chatty
This makes it easier to read the logs when doing testing.
Signed-off-by Mark Brown <[email protected]>
--- drivers/regulator/virtual.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/regulator/virtual.c +8 -0
@@ -34,6 +34,8 @@ static void update_voltage_constraints(struct device *dev,if (data->min_uV && data->max_uV && data->min_uV <= data->max_uV) { +dev_dbg (dev,"Requesting %d-%duV\n" , + data->min_uV, data->max_uV); ret =regulator_set_voltage (data->regulator, data->min_uV, data->max_uV);if (ret !=0 ) {
@@ -44,6 +46,7 @@ static void update_voltage_constraints(struct device *dev, }if (data->min_uV && data->max_uV && !data->enabled) { +dev_dbg (dev,"Enabling regulator\n" ); ret =regulator_enable (data->regulator);if (ret ==0 ) data->enabled =1 ;
@@ -53,6 +56,7 @@ static void update_voltage_constraints(struct device *dev, }if (!(data->min_uV && data->max_uV) && data->enabled) { +dev_dbg (dev,"Disabling regulator\n" ); ret =regulator_disable (data->regulator);if (ret ==0 ) data->enabled =0 ;
@@ -69,6 +73,8 @@ static void update_current_limit_constraints(struct device *dev,if (data->max_uA && data->min_uA <= data->max_uA) { +dev_dbg (dev,"Requesting %d-%duA\n" , + data->min_uA, data->max_uA); ret =regulator_set_current_limit (data->regulator, data->min_uA, data->max_uA);if (ret !=0 ) {
@@ -80,6 +86,7 @@ static void update_current_limit_constraints(struct device *dev, }if (data->max_uA && !data->enabled) { +dev_dbg (dev,"Enabling regulator\n" ); ret =regulator_enable (data->regulator);if (ret ==0 ) data->enabled =1 ;
@@ -89,6 +96,7 @@ static void update_current_limit_constraints(struct device *dev, }if (!(data->min_uA && data->max_uA) && data->enabled) { +dev_dbg (dev,"Disabling regulator\n" ); ret =regulator_disable (data->regulator);if (ret ==0 ) data->enabled =0 ;
Signature · 1 line
1.6.3.1
Re: [PATCH 2/2] regulator: Make virtual consumer a bit more chatty
Quoted 7 lines · Mark Brown
This makes it easier to read the logs when doing testing.
Signed-off-by Mark Brown <[email protected]>--- drivers/regulator/virtual.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
Applied both.
Thanks
Liam