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