lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pch_uart : fix warnings for 64bit compile

Browse Source 
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>
This commit is contained in:
Tomoya MORINAGA
2010-12-16 16:13:29 +09:00
committed by Greg Kroah-Hartman
parent e4f05af136
commit 1c5189976f
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/serial/pch_uart.c
View File

@@ -682,7 +682,8 @@ static int dma_handle_rx(struct eg20t_port *priv)
sg_dma_len(sg) = priv->fifo_size; sg_dma_len(sg) = priv->fifo_size;
sg_set_page(&priv->sg_rx, virt_to_page(priv->rx_buf_virt), sg_set_page(&priv->sg_rx, virt_to_page(priv->rx_buf_virt),
sg_dma_len(sg), (int)priv->rx_buf_virt & ~PAGE_MASK); sg_dma_len(sg), (unsigned long)priv->rx_buf_virt &
~PAGE_MASK);
sg_dma_address(sg) = priv->rx_buf_dma; sg_dma_address(sg) = priv->rx_buf_dma;
@@ -1254,7 +1255,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
int ret; int ret;
unsigned int iobase; unsigned int iobase;
unsigned int mapbase; unsigned int mapbase;
unsigned int rxbuf; unsigned char *rxbuf;
int fifosize, base_baud; int fifosize, base_baud;
static int num; static int num;
@@ -1262,7 +1263,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
if (priv == NULL) if (priv == NULL)
goto init_port_alloc_err; goto init_port_alloc_err;
rxbuf = __get_free_page(GFP_KERNEL); rxbuf = (unsigned char *)__get_free_page(GFP_KERNEL);
if (!rxbuf) if (!rxbuf)
goto init_port_free_txbuf; goto init_port_free_txbuf;
@@ -1286,7 +1287,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
priv->iobase = iobase; priv->iobase = iobase;
priv->pdev = pdev; priv->pdev = pdev;
priv->tx_empty = 1; priv->tx_empty = 1;
priv->rxbuf.buf = (unsigned char *)rxbuf; priv->rxbuf.buf = rxbuf;
priv->rxbuf.size = PAGE_SIZE; priv->rxbuf.size = PAGE_SIZE;
priv->fifo_size = fifosize; priv->fifo_size = fifosize;
@@ -1313,7 +1314,7 @@ static struct eg20t_port *pch_uart_init_port(struct pci_dev *pdev,
return priv; return priv;
init_port_hal_free: init_port_hal_free:
free_page(rxbuf); free_page((unsigned long)rxbuf);
init_port_free_txbuf: init_port_free_txbuf:
kfree(priv); kfree(priv);
init_port_alloc_err: init_port_alloc_err:
@@ -1325,7 +1326,7 @@ static void pch_uart_exit_port(struct eg20t_port *priv)
{ {
uart_remove_one_port(&pch_uart_driver, &priv->port); uart_remove_one_port(&pch_uart_driver, &priv->port);
pci_set_drvdata(priv->pdev, NULL); pci_set_drvdata(priv->pdev, NULL);
free_page((unsigned int)priv->rxbuf.buf); free_page((unsigned long)priv->rxbuf.buf);
} }
static void pch_uart_pci_remove(struct pci_dev *pdev) static void pch_uart_pci_remove(struct pci_dev *pdev)