Commit 64fa3bc3 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

usb: common: Switch to device_property_match_property_string()

parent 625fa771
Loading
Loading
Loading
Loading
+7 −8
Original line number Diff line number Diff line
@@ -107,19 +107,18 @@ EXPORT_SYMBOL_GPL(usb_speed_string);
 */
enum usb_device_speed usb_get_maximum_speed(struct device *dev)
{
	const char *maximum_speed;
	const char *p = "maximum-speed";
	int ret;

	ret = device_property_read_string(dev, "maximum-speed", &maximum_speed);
	if (ret < 0)
		return USB_SPEED_UNKNOWN;

	ret = match_string(ssp_rate, ARRAY_SIZE(ssp_rate), maximum_speed);
	ret = device_property_match_property_string(dev, p, ssp_rate, ARRAY_SIZE(ssp_rate));
	if (ret > 0)
		return USB_SPEED_SUPER_PLUS;

	ret = match_string(speed_names, ARRAY_SIZE(speed_names), maximum_speed);
	return (ret < 0) ? USB_SPEED_UNKNOWN : ret;
	ret = device_property_match_property_string(dev, p, speed_names, ARRAY_SIZE(speed_names));
	if (ret > 0)
		return ret;

	return USB_SPEED_UNKNOWN;
}
EXPORT_SYMBOL_GPL(usb_get_maximum_speed);