From: Sergei Shtylyov <sshtylyov@mvista.com>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: balbi@ti.com, grant.likely@secretlab.ca, rob.herring@calxeda.com,
rob@landley.net, linux@arm.linux.org.uk,
gregkh@linuxfoundation.org, b-cousson@ti.com, rnayak@ti.com,
tony@atomide.com, devicetree-discuss@lists.ozlabs.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
linux-usb@vger.kernel.org
Subject: Re: [PATCH v2 3/3] usb: musb: omap: Add device tree support for omap musb glue
Date: Tue, 08 Jan 2013 22:32:16 +0300 [thread overview]
Message-ID: <50EC7440.20203@mvista.com> (raw)
In-Reply-To: <1347354580-5895-4-git-send-email-kishon@ti.com>
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@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
prev parent reply other threads:[~2013-01-08 18:42 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-11 9:09 [PATCH v2 0/3] omap: musb: Add device tree support Kishon Vijay Abraham I
2012-09-11 9:09 ` [PATCH v2 1/3] arm: omap: hwmod: add a new addr space in otg for writing to control module Kishon Vijay Abraham I
2012-09-11 9:13 ` Benoit Cousson
2012-09-11 9:09 ` [PATCH v2 2/3] usb: musb: omap: write directly to mailbox instead of using phy Kishon Vijay Abraham I
2012-09-11 9:09 ` [PATCH v2 3/3] usb: musb: omap: Add device tree support for omap musb glue Kishon Vijay Abraham I
2012-09-11 9:53 ` Vaibhav Hiremath
2012-09-11 11:24 ` ABRAHAM, KISHON VIJAY
2012-09-11 11:34 ` Hiremath, Vaibhav
2013-01-08 19:32 ` Sergei Shtylyov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50EC7440.20203@mvista.com \
--to=sshtylyov@mvista.com \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rnayak@ti.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).