diff mbox series

[v2,2/3] regulator: userspace-consumer: Retrieve supplies from DT

Message ID 20231004121010.1192344-2-naresh.solanki@9elements.com
State New
Headers
Series [v2,1/3] dt-bindings: regulator: regulator-output: Multiple supplies |

Commit Message

Naresh Solanki Oct. 4, 2023, 12:10 p.m. UTC 
  From: Naresh Solanki <Naresh.Solanki@9elements.com>

Instead of hardcoding a single supply, retrieve supplies from DT.

Signed-off-by: Naresh Solanki <Naresh.Solanki@9elements.com>
---
Changes in V2:
- Use strlen for SUPPLY_SUFFIX_LEN,
- Remove bracket for single line statements in if statement.
- Remove extra space in variable declaration.
- Simplify multi line statement by calculating size in seperate
  variable.
- Add function prop_supply_name & simplify code.
- Use devm_kstrdup instead to simplify code further.
- Update DT binding to align with changes.
---
 drivers/regulator/userspace-consumer.c | 51 ++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 4 deletions(-)

Comments

kernel test robot Oct. 4, 2023, 6:11 p.m. UTC | #1 
Hi Naresh,

kernel test robot noticed the following build errors:

[auto build test ERROR on f9a1d31874c383f58bb4f89bfe79b764682cd026]

url:    https://github.com/intel-lab-lkp/linux/commits/Naresh-Solanki/regulator-userspace-consumer-Retrieve-supplies-from-DT/20231004-201151
base:   f9a1d31874c383f58bb4f89bfe79b764682cd026
patch link:    https://lore.kernel.org/r/20231004121010.1192344-2-naresh.solanki%409elements.com
patch subject: [PATCH v2 2/3] regulator: userspace-consumer: Retrieve supplies from DT
config: i386-buildonly-randconfig-003-20231004 (https://download.01.org/0day-ci/archive/20231005/202310050133.mv0eecfC-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231005/202310050133.mv0eecfC-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202310050133.mv0eecfC-lkp@intel.com/

All error/warnings (new ones prefixed by >>):

   drivers/regulator/userspace-consumer.c: In function 'get_num_supplies':
>> drivers/regulator/userspace-consumer.c:139:9: error: implicit declaration of function 'for_each_property_of_node'; did you mean 'for_each_child_of_node'? [-Werror=implicit-function-declaration]
     139 |         for_each_property_of_node(pdev->dev.of_node, prop) {
         |         ^~~~~~~~~~~~~~~~~~~~~~~~~
         |         for_each_child_of_node
>> drivers/regulator/userspace-consumer.c:139:59: error: expected ';' before '{' token
     139 |         for_each_property_of_node(pdev->dev.of_node, prop) {
         |                                                           ^~
         |                                                           ;
   drivers/regulator/userspace-consumer.c:137:13: warning: unused variable 'num_supplies' [-Wunused-variable]
     137 |         int num_supplies = 0;
         |             ^~~~~~~~~~~~
   drivers/regulator/userspace-consumer.c:144:1: error: no return statement in function returning non-void [-Werror=return-type]
     144 | }
         | ^
   drivers/regulator/userspace-consumer.c: In function 'regulator_userspace_consumer_probe':
   drivers/regulator/userspace-consumer.c:170:67: error: expected ';' before '{' token
     170 |                 for_each_property_of_node(pdev->dev.of_node, prop) {
         |                                                                   ^~
         |                                                                   ;
   drivers/regulator/userspace-consumer.c: At top level:
>> drivers/regulator/userspace-consumer.c:121:15: warning: 'prop_supply_name' defined but not used [-Wunused-function]
     121 | static size_t prop_supply_name(char *prop_name)
         |               ^~~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors


vim +139 drivers/regulator/userspace-consumer.c

   120	
 > 121	static size_t prop_supply_name(char *prop_name)
   122	{
   123		int len = strlen(prop_name);
   124	
   125		if (len <= SUPPLY_SUFFIX_LEN)
   126			return 0;
   127	
   128		if (strcmp(prop_name + len - SUPPLY_SUFFIX_LEN, SUPPLY_SUFFIX) == 0)
   129			return len - SUPPLY_SUFFIX_LEN;
   130	
   131		return 0;
   132	}
   133	
   134	static int get_num_supplies(struct platform_device *pdev)
   135	{
   136		struct  property *prop;
   137		int num_supplies = 0;
   138	
 > 139		for_each_property_of_node(pdev->dev.of_node, prop) {
   140			if (prop_supply_name(prop->name))
   141				num_supplies++;
   142		}
   143		return num_supplies;
   144	}
   145
kernel test robot Oct. 10, 2023, 4:47 p.m. UTC | #2 
Hi Naresh,

kernel test robot noticed the following build errors:

[auto build test ERROR on f9a1d31874c383f58bb4f89bfe79b764682cd026]

url:    https://github.com/intel-lab-lkp/linux/commits/Naresh-Solanki/regulator-userspace-consumer-Retrieve-supplies-from-DT/20231004-201151
base:   f9a1d31874c383f58bb4f89bfe79b764682cd026
patch link:    https://lore.kernel.org/r/20231004121010.1192344-2-naresh.solanki%409elements.com
patch subject: [PATCH v2 2/3] regulator: userspace-consumer: Retrieve supplies from DT
config: x86_64-buildonly-randconfig-003-20231010 (https://download.01.org/0day-ci/archive/20231011/202310110043.uMSq3kAw-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231011/202310110043.uMSq3kAw-lkp@intel.com/reproduce)

If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202310110043.uMSq3kAw-lkp@intel.com/

All errors (new ones prefixed by >>):

   drivers/regulator/userspace-consumer.c: In function 'get_num_supplies':
   drivers/regulator/userspace-consumer.c:139:9: error: implicit declaration of function 'for_each_property_of_node'; did you mean 'for_each_child_of_node'? [-Werror=implicit-function-declaration]
     139 |         for_each_property_of_node(pdev->dev.of_node, prop) {
         |         ^~~~~~~~~~~~~~~~~~~~~~~~~
         |         for_each_child_of_node
   drivers/regulator/userspace-consumer.c:139:59: error: expected ';' before '{' token
     139 |         for_each_property_of_node(pdev->dev.of_node, prop) {
         |                                                           ^~
         |                                                           ;
   drivers/regulator/userspace-consumer.c:137:13: warning: unused variable 'num_supplies' [-Wunused-variable]
     137 |         int num_supplies = 0;
         |             ^~~~~~~~~~~~
>> drivers/regulator/userspace-consumer.c:144:1: error: no return statement in function returning non-void [-Werror=return-type]
     144 | }
         | ^
   drivers/regulator/userspace-consumer.c: In function 'regulator_userspace_consumer_probe':
   drivers/regulator/userspace-consumer.c:170:67: error: expected ';' before '{' token
     170 |                 for_each_property_of_node(pdev->dev.of_node, prop) {
         |                                                                   ^~
         |                                                                   ;
   drivers/regulator/userspace-consumer.c: At top level:
   drivers/regulator/userspace-consumer.c:121:15: warning: 'prop_supply_name' defined but not used [-Wunused-function]
     121 | static size_t prop_supply_name(char *prop_name)
         |               ^~~~~~~~~~~~~~~~
   cc1: some warnings being treated as errors


vim +144 drivers/regulator/userspace-consumer.c

   133	
   134	static int get_num_supplies(struct platform_device *pdev)
   135	{
   136		struct  property *prop;
   137		int num_supplies = 0;
   138	
   139		for_each_property_of_node(pdev->dev.of_node, prop) {
   140			if (prop_supply_name(prop->name))
   141				num_supplies++;
   142		}
   143		return num_supplies;
 > 144	}
   145
diff mbox series

Patch

diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c
index 97f075ed68c9..13c0a86ab32c 100644
--- a/drivers/regulator/userspace-consumer.c
+++ b/drivers/regulator/userspace-consumer.c
@@ -115,12 +115,41 @@  static const struct attribute_group attr_group = {
 	.is_visible =  attr_visible,
 };
 
+#define SUPPLY_SUFFIX "-supply"
+#define SUPPLY_SUFFIX_LEN strlen(SUPPLY_SUFFIX)
+
+static size_t prop_supply_name(char *prop_name)
+{
+	int len = strlen(prop_name);
+
+	if (len <= SUPPLY_SUFFIX_LEN)
+		return 0;
+
+	if (strcmp(prop_name + len - SUPPLY_SUFFIX_LEN, SUPPLY_SUFFIX) == 0)
+		return len - SUPPLY_SUFFIX_LEN;
+
+	return 0;
+}
+
+static int get_num_supplies(struct platform_device *pdev)
+{
+	struct  property *prop;
+	int num_supplies = 0;
+
+	for_each_property_of_node(pdev->dev.of_node, prop) {
+		if (prop_supply_name(prop->name))
+			num_supplies++;
+	}
+	return num_supplies;
+}
+
 static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 {
 	struct regulator_userspace_consumer_data tmpdata;
 	struct regulator_userspace_consumer_data *pdata;
 	struct userspace_consumer_data *drvdata;
-	int ret;
+	struct property *prop;
+	int ret, supplies_size;
 
 	pdata = dev_get_platdata(&pdev->dev);
 	if (!pdata) {
@@ -131,11 +160,25 @@  static int regulator_userspace_consumer_probe(struct platform_device *pdev)
 		memset(pdata, 0, sizeof(*pdata));
 
 		pdata->no_autoswitch = true;
-		pdata->num_supplies = 1;
-		pdata->supplies = devm_kzalloc(&pdev->dev, sizeof(*pdata->supplies), GFP_KERNEL);
+		pdata->num_supplies = get_num_supplies(pdev);
+
+		supplies_size = pdata->num_supplies * sizeof(*pdata->supplies);
+		pdata->supplies = devm_kzalloc(&pdev->dev, supplies_size, GFP_KERNEL);
 		if (!pdata->supplies)
 			return -ENOMEM;
-		pdata->supplies[0].supply = "vout";
+
+		for_each_property_of_node(pdev->dev.of_node, prop) {
+			const char *prop_name = prop->name;
+			size_t supply_len = prop_supply_name(prop->name);
+
+			if (!supply_len)
+				continue;
+
+			char *supply_name = devm_kstrdup(&pdev->dev, prop_name, GFP_KERNEL);
+
+			supply_name[supply_len] = '\0';
+			pdata->supplies[0].supply = supply_name;
+		}
 	}
 
 	if (pdata->num_supplies < 1) {