| Message ID | 1349431628-2819-4-git-send-email-kishon@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hello. On 05-10-2012 12:07, Kishon Vijay Abraham I wrote: > Platfrom device for ocp2scp is created using omap_device_build in > devices file. This is used for both omap4(musb) and omap5(dwc3). > > Signed-off-by: Kishon Vijay Abraham I<kishon@ti.com> > --- > arch/arm/mach-omap2/devices.c | 72 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c > index c8c2117..e2ba505 100644 > --- a/arch/arm/mach-omap2/devices.c > +++ b/arch/arm/mach-omap2/devices.c [...] > @@ -613,6 +614,76 @@ static void omap_init_vout(void) [...] > +static void omap_init_ocp2scp(void) > +{ > + struct omap_hwmod *oh; > + struct platform_device *pdev; > + int bus_id = -1, dev_cnt = 0, i; > + struct omap_ocp2scp_dev *ocp2scp_dev; > + const char *oh_name, *name; > + struct omap_ocp2scp_platform_data *pdata; > + > + oh_name = "ocp2scp_usb_phy"; > + name = "omap-ocp2scp"; > + > + oh = omap_hwmod_lookup(oh_name); > + if (!oh) { > + pr_err("%s: could not find omap_hwmod for %s\n", __func__, > + oh_name); > + return; > + } > + > + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); > + if (!pdata) { > + pr_err("%s: No memory for ocp2scp pdata\n", __func__); > + return; > + } > + > + ocp2scp_dev = oh->dev_attr; > + dev_cnt = count_ocp2scp_devices(ocp2scp_dev); > + > + if (!dev_cnt) { > + pr_err("%s: No devices connected to ocp2scp\n", __func__); > + return; Don't you leak 'pdata' here? > + } > + > + pdata->devices = kzalloc(sizeof(struct omap_ocp2scp_dev *) > + * dev_cnt, GFP_KERNEL); > + if (!pdata->devices) { > + pr_err("%s: No memory for ocp2scp pdata devices\n", __func__); > + return; > + } > + > + for (i = 0; i< dev_cnt; i++, ocp2scp_dev++) > + pdata->devices[i] = ocp2scp_dev; > + > + pdata->dev_cnt = dev_cnt; > + > + pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata), NULL, > + 0, false); > + if (IS_ERR(pdev)) { > + pr_err("Could not build omap_device for %s %s\n", > + name, oh_name); > + return; Don't you leak 'pdata' and 'pdata->devices' here? > + } > +} > WBR, Sergei
Hi, On Saturday 06 October 2012 04:00 AM, Sergei Shtylyov wrote: > Hello. > > On 05-10-2012 12:07, Kishon Vijay Abraham I wrote: > >> Platfrom device for ocp2scp is created using omap_device_build in >> devices file. This is used for both omap4(musb) and omap5(dwc3). >> >> Signed-off-by: Kishon Vijay Abraham I<kishon@ti.com> >> --- >> arch/arm/mach-omap2/devices.c | 72 >> +++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 72 insertions(+) >> >> diff --git a/arch/arm/mach-omap2/devices.c >> b/arch/arm/mach-omap2/devices.c >> index c8c2117..e2ba505 100644 >> --- a/arch/arm/mach-omap2/devices.c >> +++ b/arch/arm/mach-omap2/devices.c > [...] >> @@ -613,6 +614,76 @@ static void omap_init_vout(void) > [...] > >> +static void omap_init_ocp2scp(void) >> +{ >> + struct omap_hwmod *oh; >> + struct platform_device *pdev; >> + int bus_id = -1, dev_cnt = 0, i; >> + struct omap_ocp2scp_dev *ocp2scp_dev; >> + const char *oh_name, *name; >> + struct omap_ocp2scp_platform_data *pdata; >> + >> + oh_name = "ocp2scp_usb_phy"; >> + name = "omap-ocp2scp"; >> + >> + oh = omap_hwmod_lookup(oh_name); >> + if (!oh) { >> + pr_err("%s: could not find omap_hwmod for %s\n", __func__, >> + oh_name); >> + return; >> + } >> + >> + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); >> + if (!pdata) { >> + pr_err("%s: No memory for ocp2scp pdata\n", __func__); >> + return; >> + } >> + >> + ocp2scp_dev = oh->dev_attr; >> + dev_cnt = count_ocp2scp_devices(ocp2scp_dev); >> + >> + if (!dev_cnt) { >> + pr_err("%s: No devices connected to ocp2scp\n", __func__); >> + return; > > Don't you leak 'pdata' here? > >> + } >> + >> + pdata->devices = kzalloc(sizeof(struct omap_ocp2scp_dev *) >> + * dev_cnt, GFP_KERNEL); >> + if (!pdata->devices) { >> + pr_err("%s: No memory for ocp2scp pdata devices\n", __func__); >> + return; >> + } >> + >> + for (i = 0; i< dev_cnt; i++, ocp2scp_dev++) >> + pdata->devices[i] = ocp2scp_dev; >> + >> + pdata->dev_cnt = dev_cnt; >> + >> + pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata), >> NULL, >> + 0, false); >> + if (IS_ERR(pdev)) { >> + pr_err("Could not build omap_device for %s %s\n", >> + name, oh_name); >> + return; > > Don't you leak 'pdata' and 'pdata->devices' here? Will re-post the patch fixing it. Thanks Kishon
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index c8c2117..e2ba505 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -19,6 +19,7 @@ #include <linux/of.h> #include <linux/pinctrl/machine.h> #include <linux/platform_data/omap4-keypad.h> +#include <linux/platform_data/omap_ocp2scp.h> #include <asm/mach-types.h> #include <asm/mach/map.h> @@ -613,6 +614,76 @@ static void omap_init_vout(void) static inline void omap_init_vout(void) {} #endif +#if defined(CONFIG_OMAP_OCP2SCP) || defined(CONFIG_OMAP_OCP2SCP_MODULE) +static int count_ocp2scp_devices(struct omap_ocp2scp_dev *ocp2scp_dev) +{ + int cnt = 0; + + while (ocp2scp_dev->drv_name != NULL) { + cnt++; + ocp2scp_dev++; + } + + return cnt; +} + +static void omap_init_ocp2scp(void) +{ + struct omap_hwmod *oh; + struct platform_device *pdev; + int bus_id = -1, dev_cnt = 0, i; + struct omap_ocp2scp_dev *ocp2scp_dev; + const char *oh_name, *name; + struct omap_ocp2scp_platform_data *pdata; + + oh_name = "ocp2scp_usb_phy"; + name = "omap-ocp2scp"; + + oh = omap_hwmod_lookup(oh_name); + if (!oh) { + pr_err("%s: could not find omap_hwmod for %s\n", __func__, + oh_name); + return; + } + + pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); + if (!pdata) { + pr_err("%s: No memory for ocp2scp pdata\n", __func__); + return; + } + + ocp2scp_dev = oh->dev_attr; + dev_cnt = count_ocp2scp_devices(ocp2scp_dev); + + if (!dev_cnt) { + pr_err("%s: No devices connected to ocp2scp\n", __func__); + return; + } + + pdata->devices = kzalloc(sizeof(struct omap_ocp2scp_dev *) + * dev_cnt, GFP_KERNEL); + if (!pdata->devices) { + pr_err("%s: No memory for ocp2scp pdata devices\n", __func__); + return; + } + + for (i = 0; i < dev_cnt; i++, ocp2scp_dev++) + pdata->devices[i] = ocp2scp_dev; + + pdata->dev_cnt = dev_cnt; + + pdev = omap_device_build(name, bus_id, oh, pdata, sizeof(*pdata), NULL, + 0, false); + if (IS_ERR(pdev)) { + pr_err("Could not build omap_device for %s %s\n", + name, oh_name); + return; + } +} +#else +static inline void omap_init_ocp2scp(void) { } +#endif + /*-------------------------------------------------------------------------*/ static int __init omap2_init_devices(void) @@ -640,6 +711,7 @@ static int __init omap2_init_devices(void) omap_init_sham(); omap_init_aes(); omap_init_vout(); + omap_init_ocp2scp(); return 0; }
Platfrom device for ocp2scp is created using omap_device_build in devices file. This is used for both omap4(musb) and omap5(dwc3). Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- arch/arm/mach-omap2/devices.c | 72 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+)