hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

usb: musb: jz4740: Add local dev variable to clean up probe 

Clean up the probe function by using a local 'struct device *dev'
variable, instead of referencing &pdev->dev everytime.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Bin Liu <b-liu@ti.com>
Link: https://lore.kernel.org/r/20200115132547.364-13-b-liu@ti.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Paul Cercueil 2020-01-15 07:25:34 -06:00 committed by Greg Kroah-Hartman
parent 7e2ee1ab02
commit 4b70331b6f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/usb/musb/jz4740.c
View File

@ -109,36 +109,37 @@ static const struct musb_platform_ops jz4740_musb_ops = {
static int jz4740_probe(struct platform_device *pdev) static int jz4740_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev;
struct musb_hdrc_platform_data *pdata = &jz4740_musb_platform_data; struct musb_hdrc_platform_data *pdata = &jz4740_musb_platform_data;
struct platform_device *musb; struct platform_device *musb;
struct jz4740_glue *glue; struct jz4740_glue *glue;
struct clk *clk; struct clk *clk;
int ret; int ret;
glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); glue = devm_kzalloc(dev, sizeof(*glue), GFP_KERNEL);
if (!glue) if (!glue)
return -ENOMEM; return -ENOMEM;
musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO); musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO);
if (!musb) { if (!musb) {
dev_err(&pdev->dev, "failed to allocate musb device\n"); dev_err(dev, "failed to allocate musb device");
return -ENOMEM; return -ENOMEM;
} }
clk = devm_clk_get(&pdev->dev, "udc"); clk = devm_clk_get(dev, "udc");
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "failed to get clock\n"); dev_err(dev, "failed to get clock");
ret = PTR_ERR(clk); ret = PTR_ERR(clk);
goto err_platform_device_put; goto err_platform_device_put;
} }
ret = clk_prepare_enable(clk); ret = clk_prepare_enable(clk);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to enable clock\n"); dev_err(dev, "failed to enable clock");
goto err_platform_device_put; goto err_platform_device_put;
} }
musb->dev.parent = &pdev->dev; musb->dev.parent = dev;
glue->musb = musb; glue->musb = musb;
glue->clk = clk; glue->clk = clk;
@ -150,19 +151,19 @@ static int jz4740_probe(struct platform_device *pdev)
ret = platform_device_add_resources(musb, pdev->resource, ret = platform_device_add_resources(musb, pdev->resource,
pdev->num_resources); pdev->num_resources);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to add resources\n"); dev_err(dev, "failed to add resources");
goto err_clk_disable; goto err_clk_disable;
} }
ret = platform_device_add_data(musb, pdata, sizeof(*pdata)); ret = platform_device_add_data(musb, pdata, sizeof(*pdata));
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to add platform_data\n"); dev_err(dev, "failed to add platform_data");
goto err_clk_disable; goto err_clk_disable;
} }
ret = platform_device_add(musb); ret = platform_device_add(musb);
if (ret) { if (ret) {
dev_err(&pdev->dev, "failed to register musb device\n"); dev_err(dev, "failed to register musb device");
goto err_clk_disable; goto err_clk_disable;
} }