Skip to content

Commit

Permalink
[ARM] 4998/1: <IMX UART>: do not use hardcoded io space size
Browse files Browse the repository at this point in the history
Do not use hardcoded io space size. Instead use the information provided
by the resource.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Sascha Hauer authored and Russell King committed Apr 17, 2008
1 parent 789d525 commit 3d45444
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions drivers/serial/imx.c
Original file line number Diff line number Diff line change
Expand Up @@ -166,11 +166,6 @@
#define SERIAL_IMX_MAJOR 204
#define MINOR_START 41

/*
* This is the size of our serial port register set.
*/
#define UART_PORT_SIZE 0x100

/*
* This determines how often we check the modem status signals
* for any change. They generally aren't connected to an IRQ
Expand Down Expand Up @@ -721,20 +716,30 @@ static const char *imx_type(struct uart_port *port)
*/
static void imx_release_port(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
struct platform_device *pdev = to_platform_device(port->dev);
struct resource *mmres;

release_mem_region(sport->port.mapbase, UART_PORT_SIZE);
mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(mmres->start, mmres->end - mmres->start + 1);
}

/*
* Request the memory region(s) being used by 'port'.
*/
static int imx_request_port(struct uart_port *port)
{
struct imx_port *sport = (struct imx_port *)port;
struct platform_device *pdev = to_platform_device(port->dev);
struct resource *mmres;
void *ret;

mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mmres)
return -ENODEV;

ret = request_mem_region(mmres->start, mmres->end - mmres->start + 1,
"imx-uart");

return request_mem_region(sport->port.mapbase, UART_PORT_SIZE,
"imx-uart") != NULL ? 0 : -EBUSY;
return ret ? 0 : -EBUSY;
}

/*
Expand Down

0 comments on commit 3d45444

Please sign in to comment.