[PATCH v2 3/3] usb: musb: omap: Add device tree support for omap musb glue
Sergei Shtylyov
sshtylyov at mvista.com
Tue Jan 8 14:32:16 EST 2013
Hello.
On 09/11/2012 01:09 PM, Kishon Vijay Abraham I wrote:
> Added device tree support for omap musb driver and updated the
> Documentation with device tree binding information.
> Signed-off-by: Kishon Vijay Abraham I <kishon at ti.com>
Belated comments to the patch which didn't pass my message size filter in
time. :-)
> diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> index f4d9503..d96873b 100644
> --- a/drivers/usb/musb/omap2430.c
> +++ b/drivers/usb/musb/omap2430.c
[...]
> @@ -470,8 +471,11 @@ static u64 omap2430_dmamask = DMA_BIT_MASK(32);
> static int __devinit omap2430_probe(struct platform_device *pdev)
> {
> struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data;
> + struct omap_musb_board_data *data;
> struct platform_device *musb;
> struct omap2430_glue *glue;
> + struct device_node *np = pdev->dev.of_node;
> + struct musb_hdrc_config *config;
> struct resource *res;
> int ret = -ENOMEM;
>
> @@ -501,6 +505,42 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
> if (glue->control_otghs == NULL)
> dev_dbg(&pdev->dev, "Failed to obtain control memory\n");
>
> + if (np) {
> + pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
> + if (!pdata) {
> + dev_err(&pdev->dev,
> + "failed to allocate musb platfrom data\n");
> + ret = -ENOMEM;
'ret' is pre-initialized to -ENOMEM.
> + goto err1;
> + }
> +
> + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
> + if (!data) {
> + dev_err(&pdev->dev,
> + "failed to allocate musb board data\n");
Overindented this line.
> + ret = -ENOMEM;
Same comment about already pre-initialized variable.
> + goto err1;
> + }
> +
> + config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
> + if (!data) {
You allocate 'config' but check 'data' again, so instead of exiting
gracefully we get an oops later on...
> + dev_err(&pdev->dev,
> + "failed to allocate musb hdrc config\n");
No 'ret = -ENOMEM;' here -- kinda inconsistent. :-)
> + goto err1;
> + }
> +
> + of_property_read_u32(np, "mode", (u32 *)&pdata->mode);
> + of_property_read_u32(np, "interface_type",
> + (u32 *)&data->interface_type);
> + of_property_read_u32(np, "num_eps", (u32 *)&config->num_eps);
> + of_property_read_u32(np, "ram_bits", (u32 *)&config->ram_bits);
> + of_property_read_u32(np, "power", (u32 *)&pdata->power);
> + config->multipoint = of_property_read_bool(np, "multipoint");
> +
> + pdata->board_data = data;
> + pdata->config = config;
> + }
> +
> pdata->platform_ops = &omap2430_ops;
>
> platform_set_drvdata(pdev, glue);
Don't worry now, I've just sent two patches to address these shortcomings.
WBR, Sergei
More information about the linux-arm-kernel
mailing list