| Submitter | Tony Prisk |
|---|---|
| Date | Jan. 15, 2013, 4:58 a.m. |
| Message ID | <1358225886-5686-1-git-send-email-linux@prisktech.co.nz> |
| Download | mbox |
| Permalink | /patch/211993/ |
| State | New |
| Headers | show |
Pull-request
git://server.prisktech.co.nz/git/linuxwmt.git tags/vt8500-serial-fixesComments
On Tue, 2013-01-15 at 17:58 +1300, Tony Prisk wrote: > Memory mapped via ioremap call is never released. Rather than add an > iounmap call, change allocation function to devm_request_and_ioremap. > > Also, change the error on failure for this call to -EBUSY rather than > -EADDRNOTAVAIL. Grr.. I thought I fixed this typo before I sent the patch. I'll send another version but I'll wait for feedback on the series first. Regards Tony P
On Tue, Jan 15, 2013 at 05:58:06PM +1300, Tony Prisk wrote: > Convert the last memory allocation (vt8500_port) to use devm_kzalloc > and remove the fail path cleanup code from vt8500_serial_probe. > > Reorder iomem mapping above clk_enable to simplify fail code. The > clock is only enabled if all other resources are available. > > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> You've send a few different versions of this patch, with no indication as to what changed, or what one I should take. Care to send me the correct one? thanks, greg k-h
Hello. On 15-01-2013 8:58, Tony Prisk wrote: > Memory mapped via ioremap call is never released. Rather than add an > iounmap call, change allocation function to devm_request_and_ioremap. > Also, change the error on failure for this call to -EBUSY rather than > -EADDRNOTAVAIL. You meant "-EADDRNOTAVAIL rather than -ENOMEM". ;-) > Signed-off-by: Tony Prisk <linux@prisktech.co.nz> > --- > drivers/tty/serial/vt8500_serial.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > diff --git a/drivers/tty/serial/vt8500_serial.c b/drivers/tty/serial/vt8500_serial.c > index 4c4a58d..3e76dff 100644 > --- a/drivers/tty/serial/vt8500_serial.c > +++ b/drivers/tty/serial/vt8500_serial.c > @@ -615,9 +615,9 @@ static int vt8500_serial_probe(struct platform_device *pdev) > snprintf(vt8500_port->name, sizeof(vt8500_port->name), > "VT8500 UART%d", pdev->id); > > - vt8500_port->uart.membase = ioremap(mmres->start, resource_size(mmres)); > + vt8500_port->uart.membase = devm_request_and_ioremap(&pdev->dev, mmres); > if (!vt8500_port->uart.membase) { > - ret = -ENOMEM; > + ret = -EADDRNOTAVAIL; > goto err; > } WBR, Sergei
Hi Greg, This is a series of fixes/cleanup for the vt8500 serial/uart driver. I'm not sure how you want to handle these. Arguably #1, #2 and #3 are bug fixes which could go into 3.8. None of them cause immediate problems, but potentially could. #4 is definately a cleanup for 3.9. Let me know if you would rather I split them up and how. Regards Tony P v2 Changes: Restore the setting of vt8500_port->uart.uartclk which was dropped in v1. Corrected the return-on-fail of devm_request_and_ioremap to -EADDRNOTAVAIL. The following changes since commit 9931faca02c604c22335f5a935a501bb2ace6e20: Linux 3.8-rc3 (2013-01-09 18:59:55 -0800) are available in the git repository at: git://server.prisktech.co.nz/git/linuxwmt.git tags/vt8500-serial-fixes for you to fetch changes up to 08bab1720e19e4f980e9e93536add4a7e497b38e: serial: tty: Cleanup code using devm_ function (2013-01-15 17:36:50 +1300) ---------------------------------------------------------------- Series of fixes/cleanups for vt8500 serial/UART driver ---------------------------------------------------------------- Tony Prisk (4): serial: vt8500: Fix range-checking on vt8500_uart_ports serial: vt8500: ioremap'd resource is never freed serial: vt8500: UART uses gated clock rather than 24Mhz reference serial: tty: Cleanup code using devm_ function arch/arm/boot/dts/vt8500.dtsi | 40 +++++++++++++++++++++--- arch/arm/boot/dts/wm8505.dtsi | 60 ++++++++++++++++++++++++++++++++---- arch/arm/boot/dts/wm8650.dtsi | 20 ++++++++++-- drivers/tty/serial/vt8500_serial.c | 45 +++++++++++++-------------- 4 files changed, 130 insertions(+), 35 deletions(-)