From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thor Thayer Subject: Re: [PATCH] spi: dw: Don't use devm_kzalloc in master->setup callback Date: Thu, 2 Oct 2014 17:33:18 -0500 Message-ID: <542DD2AE.5050806@opensource.altera.com> References: <1409460426.31873.4.camel@phoenix> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Cc: Baruch Siach , linux-spi To: Axel Lin , Mark Brown Return-path: In-Reply-To: <1409460426.31873.4.camel@phoenix> Sender: linux-spi-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-ID: On 08/30/2014 11:47 PM, Axel Lin wrote: > device_add() expects that any memory allocated via devm_* API is only > done in the device's probe function. > > Fix below boot warning: > WARNING: CPU: 1 PID: 1 at drivers/base/dd.c:286 driver_probe_device+0x2b4/0x2f4() > Modules linked in: > CPU: 1 PID: 1 Comm: swapper/0 Not tainted 3.16.0-10474-g835c90b-dirty #160 > [] (unwind_backtrace) from [] (show_stack+0x20/0x24) > [] (show_stack) from [] (dump_stack+0x7c/0x98) > [] (dump_stack) from [] (warn_slowpath_common+0x78/0x9c) > [] (warn_slowpath_common) from [] (warn_slowpath_null+0x2c/0x34) > [] (warn_slowpath_null) from [] (driver_probe_device+0x2b4/0x2f4) > [] (driver_probe_device) from [] (__device_attach+0x50/0x54) > [] (__device_attach) from [] (bus_for_each_drv+0x54/0x9c) > [] (bus_for_each_drv) from [] (device_attach+0x84/0x90) > [] (device_attach) from [] (bus_probe_device+0x94/0xb8) > [] (bus_probe_device) from [] (device_add+0x434/0x4fc) > [] (device_add) from [] (spi_add_device+0x98/0x164) > [] (spi_add_device) from [] (spi_register_master+0x598/0x768) > [] (spi_register_master) from [] (devm_spi_register_master+0x40/0x80) > [] (devm_spi_register_master) from [] (dw_spi_add_host+0x1a8/0x258) > [] (dw_spi_add_host) from [] (dw_spi_mmio_probe+0x1d4/0x294) > [] (dw_spi_mmio_probe) from [] (platform_drv_probe+0x3c/0x6c) > [] (platform_drv_probe) from [] (driver_probe_device+0xec/0x2f4) > [] (driver_probe_device) from [] (__driver_attach+0x9c/0xa0) > [] (__driver_attach) from [] (bus_for_each_dev+0x64/0x98) > [] (bus_for_each_dev) from [] (driver_attach+0x2c/0x30) > [] (driver_attach) from [] (bus_add_driver+0xdc/0x1f4) > [] (bus_add_driver) from [] (driver_register+0x88/0x104) > [] (driver_register) from [] (__platform_driver_register+0x58/0x6c) > [] (__platform_driver_register) from [] (dw_spi_mmio_driver_init+0x18/0x20) > [] (dw_spi_mmio_driver_init) from [] (do_one_initcall+0x90/0x1d4) > [] (do_one_initcall) from [] (kernel_init_freeable+0x178/0x248) > [] (kernel_init_freeable) from [] (kernel_init+0x18/0xfc) > [] (kernel_init) from [] (ret_from_fork+0x14/0x20) > > Reported-by: Thor Thayer > Signed-off-by: Axel Lin > --- > Hi Thor, > Can you test this patch with your master->dev.of_node fix? > Thanks. Hi Axel. Sorry, I missed this somehow. Yes, I tested and this works with the master->dev.of_node fix. Thanks! Thor > drivers/spi/spi-dw.c | 12 ++++++++++-- > 1 file changed, 10 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-dw.c b/drivers/spi/spi-dw.c > index 670f062..0dd0623 100644 > --- a/drivers/spi/spi-dw.c > +++ b/drivers/spi/spi-dw.c > @@ -547,8 +547,7 @@ static int dw_spi_setup(struct spi_device *spi) > /* Only alloc on first setup */ > chip = spi_get_ctldata(spi); > if (!chip) { > - chip = devm_kzalloc(&spi->dev, sizeof(struct chip_data), > - GFP_KERNEL); > + chip = kzalloc(sizeof(struct chip_data), GFP_KERNEL); > if (!chip) > return -ENOMEM; > spi_set_ctldata(spi, chip); > @@ -606,6 +605,14 @@ static int dw_spi_setup(struct spi_device *spi) > return 0; > } > > +static void dw_spi_cleanup(struct spi_device *spi) > +{ > + struct chip_data *chip = spi_get_ctldata(spi); > + > + kfree(chip); > + spi_set_ctldata(spi, NULL); > +} > + > /* Restart the controller, disable all interrupts, clean rx fifo */ > static void spi_hw_init(struct dw_spi *dws) > { > @@ -661,6 +668,7 @@ int dw_spi_add_host(struct device *dev, struct dw_spi *dws) > master->bus_num = dws->bus_num; > master->num_chipselect = dws->num_cs; > master->setup = dw_spi_setup; > + master->cleanup = dw_spi_cleanup; > master->transfer_one_message = dw_spi_transfer_one_message; > master->max_speed_hz = dws->max_freq; > -- To unsubscribe from this list: send the line "unsubscribe linux-spi" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html