usb: musb: move usb_phy_generic_{un,}register calls to probe()/remove()

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

This patch is in preparation to supporting
calling those functions multiple times.

Signed-off-by: Felipe Balbi <balbi@ti.com>

Felipe Balbi 12 years ago e741e637 d7078df6

+11 -12

5 changed files

expand all

drivers

usb

musb

am35x.c

blackfin.c

da8xx.c

davinci.c

tusb6010.c

+2 -2

drivers/usb/musb/am35x.c

··· 360 360 if (!rev) 361 361 return -ENODEV; 362 362 363 - usb_phy_generic_register(); 364 363 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); 365 364 if (IS_ERR_OR_NULL(musb->xceiv)) 366 365 return -EPROBE_DEFER; ··· 401 402 data->set_phy_power(0); 402 403 403 404 usb_put_phy(musb->xceiv); 404 - usb_phy_generic_unregister(); 405 405 406 406 return 0; 407 407 } ··· 503 505 504 506 pdata->platform_ops = &am35x_ops; 505 507 508 + usb_phy_generic_register(); 506 509 platform_set_drvdata(pdev, glue); 507 510 508 511 pinfo = am35x_dev_info; ··· 546 547 struct am35x_glue *glue = platform_get_drvdata(pdev); 547 548 548 549 platform_device_unregister(glue->musb); 550 + usb_phy_generic_unregister(); 549 551 clk_disable(glue->clk); 550 552 clk_disable(glue->phy_clk); 551 553 clk_put(glue->clk);

+3 -3

drivers/usb/musb/blackfin.c

··· 401 401 } 402 402 gpio_direction_output(musb->config->gpio_vrsel, 0); 403 403 404 - usb_phy_generic_register(); 405 404 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); 406 405 if (IS_ERR_OR_NULL(musb->xceiv)) { 407 406 gpio_free(musb->config->gpio_vrsel); ··· 423 424 static int bfin_musb_exit(struct musb *musb) 424 425 { 425 426 gpio_free(musb->config->gpio_vrsel); 426 - 427 427 usb_put_phy(musb->xceiv); 428 - usb_phy_generic_unregister(); 428 + 429 429 return 0; 430 430 } 431 431 ··· 475 477 476 478 pdata->platform_ops = &bfin_ops; 477 479 480 + usb_phy_generic_register(); 478 481 platform_set_drvdata(pdev, glue); 479 482 480 483 memset(musb_resources, 0x00, sizeof(*musb_resources) * ··· 527 528 struct bfin_glue *glue = platform_get_drvdata(pdev); 528 529 529 530 platform_device_unregister(glue->musb); 531 + usb_phy_generic_unregister(); 530 532 kfree(glue); 531 533 532 534 return 0;

+2 -2

drivers/usb/musb/da8xx.c

··· 418 418 if (!rev) 419 419 goto fail; 420 420 421 - usb_phy_generic_register(); 422 421 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); 423 422 if (IS_ERR_OR_NULL(musb->xceiv)) { 424 423 ret = -EPROBE_DEFER; ··· 452 453 phy_off(); 453 454 454 455 usb_put_phy(musb->xceiv); 455 - usb_phy_generic_unregister(); 456 456 457 457 return 0; 458 458 } ··· 510 512 511 513 pdata->platform_ops = &da8xx_ops; 512 514 515 + usb_phy_generic_register(); 513 516 platform_set_drvdata(pdev, glue); 514 517 515 518 memset(musb_resources, 0x00, sizeof(*musb_resources) * ··· 560 561 struct da8xx_glue *glue = platform_get_drvdata(pdev); 561 562 562 563 platform_device_unregister(glue->musb); 564 + usb_phy_generic_unregister(); 563 565 clk_disable(glue->clk); 564 566 clk_put(glue->clk); 565 567 kfree(glue);

+2 -2

drivers/usb/musb/davinci.c

··· 381 381 u32 revision; 382 382 int ret = -ENODEV; 383 383 384 - usb_phy_generic_register(); 385 384 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); 386 385 if (IS_ERR_OR_NULL(musb->xceiv)) { 387 386 ret = -EPROBE_DEFER; ··· 486 487 phy_off(); 487 488 488 489 usb_put_phy(musb->xceiv); 489 - usb_phy_generic_unregister(); 490 490 491 491 return 0; 492 492 } ··· 543 545 544 546 pdata->platform_ops = &davinci_ops; 545 547 548 + usb_phy_generic_register(); 546 549 platform_set_drvdata(pdev, glue); 547 550 548 551 memset(musb_resources, 0x00, sizeof(*musb_resources) * ··· 602 603 struct davinci_glue *glue = platform_get_drvdata(pdev); 603 604 604 605 platform_device_unregister(glue->musb); 606 + usb_phy_generic_unregister(); 605 607 clk_disable(glue->clk); 606 608 clk_put(glue->clk); 607 609 kfree(glue);

+2 -3

drivers/usb/musb/tusb6010.c

··· 1065 1065 void __iomem *sync = NULL; 1066 1066 int ret; 1067 1067 1068 - usb_phy_generic_register(); 1069 1068 musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); 1070 1069 if (IS_ERR_OR_NULL(musb->xceiv)) 1071 1070 return -EPROBE_DEFER; ··· 1116 1117 iounmap(sync); 1117 1118 1118 1119 usb_put_phy(musb->xceiv); 1119 - usb_phy_generic_unregister(); 1120 1120 } 1121 1121 return ret; 1122 1122 } ··· 1131 1133 iounmap(musb->sync_va); 1132 1134 1133 1135 usb_put_phy(musb->xceiv); 1134 - usb_phy_generic_unregister(); 1135 1136 return 0; 1136 1137 } 1137 1138 ··· 1173 1176 1174 1177 pdata->platform_ops = &tusb_ops; 1175 1178 1179 + usb_phy_generic_register(); 1176 1180 platform_set_drvdata(pdev, glue); 1177 1181 1178 1182 memset(musb_resources, 0x00, sizeof(*musb_resources) * ··· 1222 1224 struct tusb6010_glue *glue = platform_get_drvdata(pdev); 1223 1225 1224 1226 platform_device_unregister(glue->musb); 1227 + usb_phy_generic_unregister(); 1225 1228 kfree(glue); 1226 1229 1227 1230 return 0;