diff options
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart_cpm2.c')
-rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index a9802e76b5fa..814ac006393f 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
31 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
33 | #include <linux/slab.h> | ||
33 | #include <linux/init.h> | 34 | #include <linux/init.h> |
34 | #include <linux/serial.h> | 35 | #include <linux/serial.h> |
35 | #include <linux/console.h> | 36 | #include <linux/console.h> |
@@ -61,7 +62,7 @@ void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port, | |||
61 | void __iomem *pram; | 62 | void __iomem *pram; |
62 | unsigned long offset; | 63 | unsigned long offset; |
63 | struct resource res; | 64 | struct resource res; |
64 | unsigned long len; | 65 | resource_size_t len; |
65 | 66 | ||
66 | /* Don't remap parameter RAM if it has already been initialized | 67 | /* Don't remap parameter RAM if it has already been initialized |
67 | * during console setup. | 68 | * during console setup. |
@@ -74,7 +75,7 @@ void __iomem *cpm_uart_map_pram(struct uart_cpm_port *port, | |||
74 | if (of_address_to_resource(np, 1, &res)) | 75 | if (of_address_to_resource(np, 1, &res)) |
75 | return NULL; | 76 | return NULL; |
76 | 77 | ||
77 | len = 1 + res.end - res.start; | 78 | len = resource_size(&res); |
78 | pram = ioremap(res.start, len); | 79 | pram = ioremap(res.start, len); |
79 | if (!pram) | 80 | if (!pram) |
80 | return NULL; | 81 | return NULL; |