Unverified Commit a277a262 authored by YueHaibing's avatar YueHaibing Committed by Mark Brown
Browse files

regulator: core: Use DEVICE_ATTR_RO macro 



Use DEVICE_ATTR_RO() helper instead of plain DEVICE_ATTR(),
which makes the code a bit shorter and easier to read.

Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Link: https://lore.kernel.org/r/20210529115226.25376-1-yuehaibing@huawei.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 96ec5afe

drivers/regulator/core.c

+60 −70
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ regulator_get_suspend_state_check(struct regulator_dev *rdev, suspend_state_t st 
	return rstate;

}



static ssize_t regulator_uV_show(struct device *dev,

static ssize_t microvolts_show(struct device *dev,

			       struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -605,16 +605,16 @@ static ssize_t regulator_uV_show(struct device *dev, 
		return uV;

	return sprintf(buf, "%d\n", uV);

}

static DEVICE_ATTR(microvolts, 0444, regulator_uV_show, NULL);

static DEVICE_ATTR_RO(microvolts);



static ssize_t regulator_uA_show(struct device *dev,

static ssize_t microamps_show(struct device *dev,

			      struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", _regulator_get_current_limit(rdev));

}

static DEVICE_ATTR(microamps, 0444, regulator_uA_show, NULL);

static DEVICE_ATTR_RO(microamps);



static ssize_t name_show(struct device *dev, struct device_attribute *attr,

			 char *buf)
@@ -645,14 +645,14 @@ static ssize_t regulator_print_opmode(char *buf, int mode) 
	return sprintf(buf, "%s\n", regulator_opmode_to_str(mode));

}



static ssize_t regulator_opmode_show(struct device *dev,

static ssize_t opmode_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);



	return regulator_print_opmode(buf, _regulator_get_mode(rdev));

}

static DEVICE_ATTR(opmode, 0444, regulator_opmode_show, NULL);

static DEVICE_ATTR_RO(opmode);



static ssize_t regulator_print_state(char *buf, int state)

{
@@ -664,7 +664,7 @@ static ssize_t regulator_print_state(char *buf, int state) 
		return sprintf(buf, "unknown\n");

}



static ssize_t regulator_state_show(struct device *dev,

static ssize_t state_show(struct device *dev,

			  struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -676,9 +676,9 @@ static ssize_t regulator_state_show(struct device *dev, 


	return ret;

}

static DEVICE_ATTR(state, 0444, regulator_state_show, NULL);

static DEVICE_ATTR_RO(state);



static ssize_t regulator_status_show(struct device *dev,

static ssize_t status_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -723,9 +723,9 @@ static ssize_t regulator_status_show(struct device *dev, 


	return sprintf(buf, "%s\n", label);

}

static DEVICE_ATTR(status, 0444, regulator_status_show, NULL);

static DEVICE_ATTR_RO(status);



static ssize_t regulator_min_uA_show(struct device *dev,

static ssize_t min_microamps_show(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -735,9 +735,9 @@ static ssize_t regulator_min_uA_show(struct device *dev, 


	return sprintf(buf, "%d\n", rdev->constraints->min_uA);

}

static DEVICE_ATTR(min_microamps, 0444, regulator_min_uA_show, NULL);

static DEVICE_ATTR_RO(min_microamps);



static ssize_t regulator_max_uA_show(struct device *dev,

static ssize_t max_microamps_show(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -747,9 +747,9 @@ static ssize_t regulator_max_uA_show(struct device *dev, 


	return sprintf(buf, "%d\n", rdev->constraints->max_uA);

}

static DEVICE_ATTR(max_microamps, 0444, regulator_max_uA_show, NULL);

static DEVICE_ATTR_RO(max_microamps);



static ssize_t regulator_min_uV_show(struct device *dev,

static ssize_t min_microvolts_show(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -759,9 +759,9 @@ static ssize_t regulator_min_uV_show(struct device *dev, 


	return sprintf(buf, "%d\n", rdev->constraints->min_uV);

}

static DEVICE_ATTR(min_microvolts, 0444, regulator_min_uV_show, NULL);

static DEVICE_ATTR_RO(min_microvolts);



static ssize_t regulator_max_uV_show(struct device *dev,

static ssize_t max_microvolts_show(struct device *dev,

				   struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -771,9 +771,9 @@ static ssize_t regulator_max_uV_show(struct device *dev, 


	return sprintf(buf, "%d\n", rdev->constraints->max_uV);

}

static DEVICE_ATTR(max_microvolts, 0444, regulator_max_uV_show, NULL);

static DEVICE_ATTR_RO(max_microvolts);



static ssize_t regulator_total_uA_show(struct device *dev,

static ssize_t requested_microamps_show(struct device *dev,

					struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -788,7 +788,7 @@ static ssize_t regulator_total_uA_show(struct device *dev, 
	regulator_unlock(rdev);

	return sprintf(buf, "%d\n", uA);

}

static DEVICE_ATTR(requested_microamps, 0444, regulator_total_uA_show, NULL);

static DEVICE_ATTR_RO(requested_microamps);



static ssize_t num_users_show(struct device *dev, struct device_attribute *attr,

			      char *buf)
@@ -813,37 +813,34 @@ static ssize_t type_show(struct device *dev, struct device_attribute *attr, 
}

static DEVICE_ATTR_RO(type);



static ssize_t regulator_suspend_mem_uV_show(struct device *dev,

static ssize_t suspend_mem_microvolts_show(struct device *dev,

					   struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", rdev->constraints->state_mem.uV);

}

static DEVICE_ATTR(suspend_mem_microvolts, 0444,

		regulator_suspend_mem_uV_show, NULL);

static DEVICE_ATTR_RO(suspend_mem_microvolts);



static ssize_t regulator_suspend_disk_uV_show(struct device *dev,

static ssize_t suspend_disk_microvolts_show(struct device *dev,

					    struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", rdev->constraints->state_disk.uV);

}

static DEVICE_ATTR(suspend_disk_microvolts, 0444,

		regulator_suspend_disk_uV_show, NULL);

static DEVICE_ATTR_RO(suspend_disk_microvolts);



static ssize_t regulator_suspend_standby_uV_show(struct device *dev,

static ssize_t suspend_standby_microvolts_show(struct device *dev,

					       struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);



	return sprintf(buf, "%d\n", rdev->constraints->state_standby.uV);

}

static DEVICE_ATTR(suspend_standby_microvolts, 0444,

		regulator_suspend_standby_uV_show, NULL);

static DEVICE_ATTR_RO(suspend_standby_microvolts);



static ssize_t regulator_suspend_mem_mode_show(struct device *dev,

static ssize_t suspend_mem_mode_show(struct device *dev,

				     struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -851,10 +848,9 @@ static ssize_t regulator_suspend_mem_mode_show(struct device *dev, 
	return regulator_print_opmode(buf,

		rdev->constraints->state_mem.mode);

}

static DEVICE_ATTR(suspend_mem_mode, 0444,

		regulator_suspend_mem_mode_show, NULL);

static DEVICE_ATTR_RO(suspend_mem_mode);



static ssize_t regulator_suspend_disk_mode_show(struct device *dev,

static ssize_t suspend_disk_mode_show(struct device *dev,

				      struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -862,10 +858,9 @@ static ssize_t regulator_suspend_disk_mode_show(struct device *dev, 
	return regulator_print_opmode(buf,

		rdev->constraints->state_disk.mode);

}

static DEVICE_ATTR(suspend_disk_mode, 0444,

		regulator_suspend_disk_mode_show, NULL);

static DEVICE_ATTR_RO(suspend_disk_mode);



static ssize_t regulator_suspend_standby_mode_show(struct device *dev,

static ssize_t suspend_standby_mode_show(struct device *dev,

					 struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -873,10 +868,9 @@ static ssize_t regulator_suspend_standby_mode_show(struct device *dev, 
	return regulator_print_opmode(buf,

		rdev->constraints->state_standby.mode);

}

static DEVICE_ATTR(suspend_standby_mode, 0444,

		regulator_suspend_standby_mode_show, NULL);

static DEVICE_ATTR_RO(suspend_standby_mode);



static ssize_t regulator_suspend_mem_state_show(struct device *dev,

static ssize_t suspend_mem_state_show(struct device *dev,

				      struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -884,10 +878,9 @@ static ssize_t regulator_suspend_mem_state_show(struct device *dev, 
	return regulator_print_state(buf,

			rdev->constraints->state_mem.enabled);

}

static DEVICE_ATTR(suspend_mem_state, 0444,

		regulator_suspend_mem_state_show, NULL);

static DEVICE_ATTR_RO(suspend_mem_state);



static ssize_t regulator_suspend_disk_state_show(struct device *dev,

static ssize_t suspend_disk_state_show(struct device *dev,

				       struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -895,10 +888,9 @@ static ssize_t regulator_suspend_disk_state_show(struct device *dev, 
	return regulator_print_state(buf,

			rdev->constraints->state_disk.enabled);

}

static DEVICE_ATTR(suspend_disk_state, 0444,

		regulator_suspend_disk_state_show, NULL);

static DEVICE_ATTR_RO(suspend_disk_state);



static ssize_t regulator_suspend_standby_state_show(struct device *dev,

static ssize_t suspend_standby_state_show(struct device *dev,

					  struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -906,10 +898,9 @@ static ssize_t regulator_suspend_standby_state_show(struct device *dev, 
	return regulator_print_state(buf,

			rdev->constraints->state_standby.enabled);

}

static DEVICE_ATTR(suspend_standby_state, 0444,

		regulator_suspend_standby_state_show, NULL);

static DEVICE_ATTR_RO(suspend_standby_state);



static ssize_t regulator_bypass_show(struct device *dev,

static ssize_t bypass_show(struct device *dev,

			   struct device_attribute *attr, char *buf)

{

	struct regulator_dev *rdev = dev_get_drvdata(dev);
@@ -928,8 +919,7 @@ static ssize_t regulator_bypass_show(struct device *dev, 


	return sprintf(buf, "%s\n", report);

}

static DEVICE_ATTR(bypass, 0444,

		   regulator_bypass_show, NULL);

static DEVICE_ATTR_RO(bypass);



/* Calculate the new optimum regulator operating mode based on the new total

 * consumer load. All locks held by caller