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

Commit efc2cd79 authored by Heikki Krogerus's avatar Heikki Krogerus Committed by Linus Torvalds
Browse files

usb: common: convert to use match_string() helper 



The new helper returns index of the mathing string in an array.  We
would use it here.

Signed-off-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9adb9254

drivers/usb/common/common.c

+8 −14
Original line number Original line Diff line number Diff line
@@ -64,18 +64,15 @@ EXPORT_SYMBOL_GPL(usb_speed_string); 
enum usb_device_speed usb_get_maximum_speed(struct device *dev)

enum usb_device_speed usb_get_maximum_speed(struct device *dev)

{

{

	const char *maximum_speed;

	const char *maximum_speed;

	int err;

	int ret;

	int i;





	err = device_property_read_string(dev, "maximum-speed", &maximum_speed);

	ret = device_property_read_string(dev, "maximum-speed", &maximum_speed);

	if (err < 0)

	if (ret < 0)

		return USB_SPEED_UNKNOWN;

		return USB_SPEED_UNKNOWN;





	for (i = 0; i < ARRAY_SIZE(speed_names); i++)

	ret = match_string(speed_names, ARRAY_SIZE(speed_names), maximum_speed);

		if (strcmp(maximum_speed, speed_names[i]) == 0)

			return i;





	return USB_SPEED_UNKNOWN;

	return (ret < 0) ? USB_SPEED_UNKNOWN : ret;

}

}

EXPORT_SYMBOL_GPL(usb_get_maximum_speed);

EXPORT_SYMBOL_GPL(usb_get_maximum_speed);
@@ -109,13 +106,10 @@ static const char *const usb_dr_modes[] = { 




static enum usb_dr_mode usb_get_dr_mode_from_string(const char *str)

static enum usb_dr_mode usb_get_dr_mode_from_string(const char *str)

{

{

	int i;

	int ret;





	for (i = 0; i < ARRAY_SIZE(usb_dr_modes); i++)

	ret = match_string(usb_dr_modes, ARRAY_SIZE(usb_dr_modes), str);

		if (!strcmp(usb_dr_modes[i], str))

	return (ret < 0) ? USB_DR_MODE_UNKNOWN : ret;

			return i;



	return USB_DR_MODE_UNKNOWN;

}

}





enum usb_dr_mode usb_get_dr_mode(struct device *dev)

enum usb_dr_mode usb_get_dr_mode(struct device *dev)