linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Michał Mirosław" <mirq-linux@rere.qmqm.pl>
To: Andrey Smirnov <andrew.smirnov@gmail.com>,
	Guenter Roeck <linux@roeck-us.net>,
	Sebastian Reichel <sebastian.reichel@collabora.com>
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: [PATCH 1/7] power: supply: core: reduce power_supply_show_usb_type() parameters
Date: Thu, 02 Apr 2020 16:57:01 +0200	[thread overview]
Message-ID: <cdf9c0b02acdee77721039d4e7557e0e232d837d.1585837575.git.mirq-linux@rere.qmqm.pl> (raw)
In-Reply-To: <cover.1585837575.git.mirq-linux@rere.qmqm.pl>

Reduce power_supply_show_usb_type() parameter count by folding
power_supply_desc dereference into the function.  This makes following
patch making usb_types const easier.

Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
---
 drivers/power/supply/power_supply_sysfs.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c
index f37ad4eae60b..51de3f47b25d 100644
--- a/drivers/power/supply/power_supply_sysfs.c
+++ b/drivers/power/supply/power_supply_sysfs.c
@@ -78,8 +78,7 @@ static const char * const power_supply_scope_text[] = {
 };
 
 static ssize_t power_supply_show_usb_type(struct device *dev,
-					  enum power_supply_usb_type *usb_types,
-					  ssize_t num_usb_types,
+					  const struct power_supply_desc *desc,
 					  union power_supply_propval *value,
 					  char *buf)
 {
@@ -88,8 +87,8 @@ static ssize_t power_supply_show_usb_type(struct device *dev,
 	bool match = false;
 	int i;
 
-	for (i = 0; i < num_usb_types; ++i) {
-		usb_type = usb_types[i];
+	for (i = 0; i < desc->num_usb_types; ++i) {
+		usb_type = desc->usb_types[i];
 
 		if (value->intval == usb_type) {
 			count += sprintf(buf + count, "[%s] ",
@@ -163,8 +162,7 @@ static ssize_t power_supply_show_property(struct device *dev,
 			      power_supply_type_text[value.intval]);
 		break;
 	case POWER_SUPPLY_PROP_USB_TYPE:
-		ret = power_supply_show_usb_type(dev, psy->desc->usb_types,
-						 psy->desc->num_usb_types,
+		ret = power_supply_show_usb_type(dev, psy->desc,
 						 &value, buf);
 		break;
 	case POWER_SUPPLY_PROP_SCOPE:
-- 
2.20.1


  reply	other threads:[~2020-04-02 14:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-02 14:57 [PATCH 0/7] power: supply: core: extensions and fixes Michał Mirosław
2020-04-02 14:57 ` Michał Mirosław [this message]
2020-04-02 14:57 ` [PATCH 2/7] power: supply: core: allow to constify property lists Michał Mirosław
2020-04-03 19:16   ` kbuild test robot
2020-04-03 19:52   ` kbuild test robot
2020-04-02 14:57 ` [PATCH 3/7] power: supply: core: fix HWMON temperature labels Michał Mirosław
2020-04-02 14:52   ` Guenter Roeck
2020-04-02 15:00     ` Michał Mirosław
2020-04-02 18:29       ` Guenter Roeck
2020-04-03 15:53         ` Michał Mirosław
2020-04-02 14:57 ` [PATCH 4/7] power: supply: core: hide unused HWMON labels Michał Mirosław
2020-04-02 14:57 ` [PATCH 5/7] power: supply: core: add input voltage/current measurements Michał Mirosław
2020-04-02 14:57 ` [PATCH 6/7] power: supply: core: add output voltage measurements Michał Mirosław
2020-04-02 14:57 ` [PATCH 7/7] power: supply: core: document measurement points Michał Mirosław

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cdf9c0b02acdee77721039d4e7557e0e232d837d.1585837575.git.mirq-linux@rere.qmqm.pl \
    --to=mirq-linux@rere.qmqm.pl \
    --cc=andrew.smirnov@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=sebastian.reichel@collabora.com \
    --subject='Re: [PATCH 1/7] power: supply: core: reduce power_supply_show_usb_type() parameters' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
on how to clone and mirror all data and code used for this inbox