From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752817AbbJGJ0i (ORCPT ); Wed, 7 Oct 2015 05:26:38 -0400 Received: from mx2.suse.de ([195.135.220.15]:35796 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752395AbbJGJ0c (ORCPT ); Wed, 7 Oct 2015 05:26:32 -0400 From: Johannes Thumshirn To: Andreas Werner Cc: gregkh@linuxfoundation.org, jslaby@suse.com, linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, morbidrsa@gmail.com Subject: Re: [PATCH] tty: serial: men_z135_uart.c: use mcb memory region size instead of hardcoded one References: <1444065794-22118-1-git-send-email-andy@wernerandy.de> Date: Wed, 07 Oct 2015 11:26:30 +0200 In-Reply-To: <1444065794-22118-1-git-send-email-andy@wernerandy.de> (Andreas Werner's message of "Mon, 5 Oct 2015 19:23:14 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Andreas Werner writes: > There is no need to hardcode the MEN_Z135_MEM_SIZE. The MCB subsystem > already knowns the size which is located in the chameleon table. > MCB parse the chameleon table to get the resources of each IP and provide > the mcb_request_mem function to get those resources. > > Use mcb_request_mem to get the resources. This function also takes care of > the memory region naming allocated by the driver for each of the instances. > > Signed-off-by: Andreas Werner Acked-by: Johannes Thumshirn > --- > drivers/tty/serial/men_z135_uart.c | 23 +++++++++++++++-------- > 1 file changed, 15 insertions(+), 8 deletions(-) > > diff --git a/drivers/tty/serial/men_z135_uart.c b/drivers/tty/serial/men_z135_uart.c > index b90e7b3..3141aa2 100644 > --- a/drivers/tty/serial/men_z135_uart.c > +++ b/drivers/tty/serial/men_z135_uart.c > @@ -35,8 +35,6 @@ > #define MEN_Z135_BAUD_REG 0x810 > #define MEN_Z135_TIMEOUT 0x814 > > -#define MEN_Z135_MEM_SIZE 0x818 > - > #define IRQ_ID(x) ((x) & 0x1f) > > #define MEN_Z135_IER_RXCIEN BIT(0) /* RX Space IRQ */ > @@ -124,6 +122,7 @@ MODULE_PARM_DESC(rx_timeout, "RX timeout. " > struct men_z135_port { > struct uart_port port; > struct mcb_device *mdev; > + struct resource *mem; > unsigned char *rxbuf; > u32 stat_reg; > spinlock_t lock; > @@ -734,22 +733,30 @@ static const char *men_z135_type(struct uart_port *port) > > static void men_z135_release_port(struct uart_port *port) > { > + struct men_z135_port *uart = to_men_z135(port); > + > iounmap(port->membase); > port->membase = NULL; > > - release_mem_region(port->mapbase, MEN_Z135_MEM_SIZE); > + mcb_release_mem(uart->mem); > } > > static int men_z135_request_port(struct uart_port *port) > { > - int size = MEN_Z135_MEM_SIZE; > + struct men_z135_port *uart = to_men_z135(port); > + struct mcb_device *mdev = uart->mdev; > + struct resource *mem; > + > + mem = mcb_request_mem(uart->mdev, dev_name(&mdev->dev)); > + if (IS_ERR(mem)) > + return PTR_ERR(mem); > > - if (!request_mem_region(port->mapbase, size, "men_z135_port")) > - return -EBUSY; > + port->mapbase = mem->start; > + uart->mem = mem; > > - port->membase = ioremap(port->mapbase, MEN_Z135_MEM_SIZE); > + port->membase = ioremap(mem->start, resource_size(mem)); > if (port->membase == NULL) { > - release_mem_region(port->mapbase, MEN_Z135_MEM_SIZE); > + mcb_release_mem(mem); > return -ENOMEM; > }