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

Commit 4525beeb authored by Felipe Balbi's avatar Felipe Balbi
Browse files

usb: phy: rename usb_nop_xceiv to usb_phy_generic 



no functional changes, just renaming the function
in order to make it slightly clearer what it should
be used for, also matching the driver name.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 0700faaf

arch/arm/mach-omap2/usb-host.c

+4 −4
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static struct fixed_voltage_config hsusb_reg_config = { 
	/* .init_data filled later */

};



static const char *nop_name = "usb_phy_gen_xceiv"; /* NOP PHY driver */

static const char *nop_name = "usb_phy_generic"; /* NOP PHY driver */

static const char *reg_name = "reg-fixed-voltage"; /* Regulator driver */



/**
@@ -435,7 +435,7 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys) 
	struct platform_device *pdev;

	char *phy_id;

	struct platform_device_info pdevinfo;

	struct usb_phy_gen_xceiv_platform_data nop_pdata;

	struct usb_phy_generic_platform_data nop_pdata;



	for (i = 0; i < num_phys; i++) {
@@ -469,8 +469,8 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys) 
		pdevinfo.id = phy->port;

		pdevinfo.data = &nop_pdata;

		pdevinfo.size_data =

			sizeof(struct usb_phy_gen_xceiv_platform_data);

		scnprintf(phy_id, MAX_STR, "usb_phy_gen_xceiv.%d",

			sizeof(struct usb_phy_generic_platform_data);

		scnprintf(phy_id, MAX_STR, "usb_phy_generic.%d",

					phy->port);

		pdev = platform_device_register_full(&pdevinfo);

		if (IS_ERR(pdev)) {

drivers/usb/dwc3/dwc3-exynos.c

+3 −3
Original line number Diff line number Diff line
@@ -38,13 +38,13 @@ struct dwc3_exynos { 


static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos)

{

	struct usb_phy_gen_xceiv_platform_data pdata;

	struct usb_phy_generic_platform_data pdata;

	struct platform_device	*pdev;

	int			ret;



	memset(&pdata, 0x00, sizeof(pdata));



	pdev = platform_device_alloc("usb_phy_gen_xceiv", PLATFORM_DEVID_AUTO);

	pdev = platform_device_alloc("usb_phy_generic", PLATFORM_DEVID_AUTO);

	if (!pdev)

		return -ENOMEM;
@@ -56,7 +56,7 @@ static int dwc3_exynos_register_phys(struct dwc3_exynos *exynos) 
	if (ret)

		goto err1;



	pdev = platform_device_alloc("usb_phy_gen_xceiv", PLATFORM_DEVID_AUTO);

	pdev = platform_device_alloc("usb_phy_generic", PLATFORM_DEVID_AUTO);

	if (!pdev) {

		ret = -ENOMEM;

		goto err1;

drivers/usb/dwc3/dwc3-pci.c

+3 −3
Original line number Diff line number Diff line
@@ -40,13 +40,13 @@ struct dwc3_pci { 


static int dwc3_pci_register_phys(struct dwc3_pci *glue)

{

	struct usb_phy_gen_xceiv_platform_data pdata;

	struct usb_phy_generic_platform_data pdata;

	struct platform_device	*pdev;

	int			ret;



	memset(&pdata, 0x00, sizeof(pdata));



	pdev = platform_device_alloc("usb_phy_gen_xceiv", 0);

	pdev = platform_device_alloc("usb_phy_generic", 0);

	if (!pdev)

		return -ENOMEM;
@@ -58,7 +58,7 @@ static int dwc3_pci_register_phys(struct dwc3_pci *glue) 
	if (ret)

		goto err1;



	pdev = platform_device_alloc("usb_phy_gen_xceiv", 1);

	pdev = platform_device_alloc("usb_phy_generic", 1);

	if (!pdev) {

		ret = -ENOMEM;

		goto err1;

drivers/usb/musb/am35x.c

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int am35x_musb_init(struct musb *musb) 
	if (!rev)

		return -ENODEV;



	usb_nop_xceiv_register();

	usb_phy_generic_register();

	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(musb->xceiv))

		return -EPROBE_DEFER;
@@ -402,7 +402,7 @@ static int am35x_musb_exit(struct musb *musb) 
		data->set_phy_power(0);



	usb_put_phy(musb->xceiv);

	usb_nop_xceiv_unregister();

	usb_phy_generic_unregister();



	return 0;

}

drivers/usb/musb/blackfin.c

+2 −2
Original line number Diff line number Diff line
@@ -401,7 +401,7 @@ static int bfin_musb_init(struct musb *musb) 
	}

	gpio_direction_output(musb->config->gpio_vrsel, 0);



	usb_nop_xceiv_register();

	usb_phy_generic_register();

	musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2);

	if (IS_ERR_OR_NULL(musb->xceiv)) {

		gpio_free(musb->config->gpio_vrsel);
@@ -426,7 +426,7 @@ static int bfin_musb_exit(struct musb *musb) 
	gpio_free(musb->config->gpio_vrsel);



	usb_put_phy(musb->xceiv);

	usb_nop_xceiv_unregister();

	usb_phy_generic_unregister();

	return 0;

}