diff options
author | Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com> | 2010-12-16 02:13:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-16 16:14:31 -0500 |
commit | 1c5189976ffc130416e808f41049c12615a6380c (patch) | |
tree | c3406915228a96b39802a41580d9dfca9b9dd73d /drivers/serial | |
parent | e4f05af136016958f52455da3070ca6622439b10 (diff) |
pch_uart : fix warnings for 64bit compile
Fix the following warnings
drivers/serial/pch_uart.c: In function ‘dma_handle_rx’:
drivers/serial/pch_uart.c:685:24: warning: cast from pointer to integer of different size
drivers/serial/pch_uart.c: In function ‘dma_handle_tx’:
drivers/serial/pch_uart.c:778:23: warning: cast from pointer to integer of different size
drivers/serial/pch_uart.c: In function ‘pch_uart_init_port’:
drivers/serial/pch_uart.c:1289:20: warning: cast to pointer from integer of different size
drivers/serial/pch_uart.c: In function ‘pch_uart_exit_port’:
drivers/serial/pch_uart.c:1328:2: warning: cast from pointer to integer of different size
Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Reported-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/pch_uart.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/serial/pch_uart.c b/drivers/serial/pch_uart.c index b94d1fa76973..70a61458ec42 100644 --- a/drivers/serial/pch_uart.c +++ b/drivers/serial/pch_uart.c | |||
@@ -682,7 +682,8 @@ static int dma_handle_rx(struct eg20t_port *priv) | |||
682 | sg_dma_len(sg) = priv->fifo_size; | 682 | sg_dma_len(sg) = priv->fifo_size; |
683 | 683 | ||
684 | sg_set_page(&priv->sg_rx, virt_to_page(priv->rx_buf_virt), | 684 | sg_set_page(&priv->sg_rx, virt_to_page(priv->rx_buf_virt), |
685 | sg_dma_len(sg), (int)priv->rx_buf_virt & ~PAGE_MASK); | 685 | sg_dma_len(sg), (unsigned long)priv->rx_buf_virt & |
686 | ~PAGE_MASK); | ||
686 | 687 | ||
687 | sg_dma_address(sg) = priv->rx_buf_dma; | 688 | sg_dma_address(sg) = priv->rx_buf_dma; |
688 | 689 | ||
@@ -1254,7 +1255,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, | |||
1254 | int ret; | 1255 | int ret; |
1255 | unsigned int iobase; | 1256 | unsigned int iobase; |
1256 | unsigned int mapbase; | 1257 | unsigned int mapbase; |
1257 | unsigned int rxbuf; | 1258 | unsigned char *rxbuf; |
1258 | int fifosize, base_baud; | 1259 | int fifosize, base_baud; |
1259 | static int num; | 1260 | static int num; |
1260 | 1261 | ||
@@ -1262,7 +1263,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, | |||
1262 | if (priv == NULL) | 1263 | if (priv == NULL) |
1263 | goto init_port_alloc_err; | 1264 | goto init_port_alloc_err; |
1264 | 1265 | ||
1265 | rxbuf = __get_free_page(GFP_KERNEL); | 1266 | rxbuf = (unsigned char *)__get_free_page(GFP_KERNEL); |
1266 | if (!rxbuf) | 1267 | if (!rxbuf) |
1267 | goto init_port_free_txbuf; | 1268 | goto init_port_free_txbuf; |
1268 | 1269 | ||
@@ -1286,7 +1287,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, | |||
1286 | priv->iobase = iobase; | 1287 | priv->iobase = iobase; |
1287 | priv->pdev = pdev; | 1288 | priv->pdev = pdev; |
1288 | priv->tx_empty = 1; | 1289 | priv->tx_empty = 1; |
1289 | priv->rxbuf.buf = (unsigned char *)rxbuf; | 1290 | priv->rxbuf.buf = rxbuf; |
1290 | priv->rxbuf.size = PAGE_SIZE; | 1291 | priv->rxbuf.size = PAGE_SIZE; |
1291 | 1292 | ||
1292 | priv->fifo_size = fifosize; | 1293 | priv->fifo_size = fifosize; |
@@ -1313,7 +1314,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev, | |||
1313 | return priv; | 1314 | return priv; |
1314 | 1315 | ||
1315 | init_port_hal_free: | 1316 | init_port_hal_free: |
1316 | free_page(rxbuf); | 1317 | free_page((unsigned long)rxbuf); |
1317 | init_port_free_txbuf: | 1318 | init_port_free_txbuf: |
1318 | kfree(priv); | 1319 | kfree(priv); |
1319 | init_port_alloc_err: | 1320 | init_port_alloc_err: |
@@ -1325,7 +1326,7 @@ static void pch_uart_exit_port(struct eg20t_port *priv) | |||
1325 | { | 1326 | { |
1326 | uart_remove_one_port(&pch_uart_driver, &priv->port); | 1327 | uart_remove_one_port(&pch_uart_driver, &priv->port); |
1327 | pci_set_drvdata(priv->pdev, NULL); | 1328 | pci_set_drvdata(priv->pdev, NULL); |
1328 | free_page((unsigned int)priv->rxbuf.buf); | 1329 | free_page((unsigned long)priv->rxbuf.buf); |
1329 | } | 1330 | } |
1330 | 1331 | ||
1331 | static void pch_uart_pci_remove(struct pci_dev *pdev) | 1332 | static void pch_uart_pci_remove(struct pci_dev *pdev) |