Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c88326c2 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

UPSTREAM: power: supply: core: reduce power_supply_show_usb_type() parameters 



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: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
(cherry picked from commit de46e0289310b5e56994eafec2f0d2a5da095ea9)
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: I1dc82a94f1aedd38052961cfc669dbeffea680f8
parent 2e904b43

drivers/power/supply/power_supply_sysfs.c

+4 −6
Original line number Diff line number Diff line
@@ -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: