GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-08 07:38:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

usb: chipidea: imx: simplify the usbmisc callers

Browse source 
Move struct imx_usbmisc_data NULL pointer judgement from caller to
each API, it can simplify the caller.

Signed-off-by: Peter Chen <peter.chen@freescale.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peter Chen 2015-02-11 12:44:44 +08:00 • committed by Greg Kroah-Hartman
parent 73dea4a912
commit a4cf1b14cf
2 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/usb/chipidea/ci_hdrc_imx.c
View file

@ -149,13 +149,10 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_clk; goto err_clk;
if (data->usbmisc_data) { ret = imx_usbmisc_init(data->usbmisc_data);
ret = imx_usbmisc_init(data->usbmisc_data); if (ret) {
if (ret) { dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", ret);
dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n", goto err_clk;
ret);
goto err_clk;
}
} }
data->ci_pdev = ci_hdrc_add_device(&pdev->dev, data->ci_pdev = ci_hdrc_add_device(&pdev->dev,
@ -169,13 +166,10 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
goto err_clk; goto err_clk;
} }
if (data->usbmisc_data) { ret = imx_usbmisc_init_post(data->usbmisc_data);
ret = imx_usbmisc_init_post(data->usbmisc_data); if (ret) {
if (ret) { dev_err(&pdev->dev, "usbmisc post failed, ret=%d\n", ret);
dev_err(&pdev->dev, "usbmisc post failed, ret=%d\n", goto disable_device;
ret);
goto disable_device;
}
} }
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);

12
drivers/usb/chipidea/usbmisc_imx.c
View file

@ -265,8 +265,12 @@ static const struct usbmisc_ops vf610_usbmisc_ops = {
int imx_usbmisc_init(struct imx_usbmisc_data *data) int imx_usbmisc_init(struct imx_usbmisc_data *data)
{ {
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev); struct imx_usbmisc *usbmisc;
if (!data)
return 0;
usbmisc = dev_get_drvdata(data->dev);
if (!usbmisc->ops->init) if (!usbmisc->ops->init)
return 0; return 0;
return usbmisc->ops->init(data); return usbmisc->ops->init(data);
@ -275,8 +279,12 @@ EXPORT_SYMBOL_GPL(imx_usbmisc_init);
int imx_usbmisc_init_post(struct imx_usbmisc_data *data) int imx_usbmisc_init_post(struct imx_usbmisc_data *data)
{ {
struct imx_usbmisc *usbmisc = dev_get_drvdata(data->dev); struct imx_usbmisc *usbmisc;
if (!data)
return 0;
usbmisc = dev_get_drvdata(data->dev);
if (!usbmisc->ops->post) if (!usbmisc->ops->post)
return 0; return 0;
return usbmisc->ops->post(data); return usbmisc->ops->post(data);