diff options
Diffstat (limited to 'drivers/tty/serial/pch_uart.c')
-rw-r--r-- | drivers/tty/serial/pch_uart.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 332f2eb8abbc..08b9962b8fda 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c | |||
@@ -304,11 +304,7 @@ static const int trigger_level_1[4] = { 1, 1, 1, 1 }; | |||
304 | #ifdef CONFIG_DEBUG_FS | 304 | #ifdef CONFIG_DEBUG_FS |
305 | 305 | ||
306 | #define PCH_REGS_BUFSIZE 1024 | 306 | #define PCH_REGS_BUFSIZE 1024 |
307 | static int pch_show_regs_open(struct inode *inode, struct file *file) | 307 | |
308 | { | ||
309 | file->private_data = inode->i_private; | ||
310 | return 0; | ||
311 | } | ||
312 | 308 | ||
313 | static ssize_t port_show_regs(struct file *file, char __user *user_buf, | 309 | static ssize_t port_show_regs(struct file *file, char __user *user_buf, |
314 | size_t count, loff_t *ppos) | 310 | size_t count, loff_t *ppos) |
@@ -362,7 +358,7 @@ static ssize_t port_show_regs(struct file *file, char __user *user_buf, | |||
362 | 358 | ||
363 | static const struct file_operations port_regs_ops = { | 359 | static const struct file_operations port_regs_ops = { |
364 | .owner = THIS_MODULE, | 360 | .owner = THIS_MODULE, |
365 | .open = pch_show_regs_open, | 361 | .open = simple_open, |
366 | .read = port_show_regs, | 362 | .read = port_show_regs, |
367 | .llseek = default_llseek, | 363 | .llseek = default_llseek, |
368 | }; | 364 | }; |
@@ -844,7 +840,7 @@ static int dma_handle_rx(struct eg20t_port *priv) | |||
844 | 840 | ||
845 | sg_dma_address(sg) = priv->rx_buf_dma; | 841 | sg_dma_address(sg) = priv->rx_buf_dma; |
846 | 842 | ||
847 | desc = priv->chan_rx->device->device_prep_slave_sg(priv->chan_rx, | 843 | desc = dmaengine_prep_slave_sg(priv->chan_rx, |
848 | sg, 1, DMA_DEV_TO_MEM, | 844 | sg, 1, DMA_DEV_TO_MEM, |
849 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 845 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
850 | 846 | ||
@@ -1003,7 +999,7 @@ static unsigned int dma_handle_tx(struct eg20t_port *priv) | |||
1003 | sg_dma_len(sg) = size; | 999 | sg_dma_len(sg) = size; |
1004 | } | 1000 | } |
1005 | 1001 | ||
1006 | desc = priv->chan_tx->device->device_prep_slave_sg(priv->chan_tx, | 1002 | desc = dmaengine_prep_slave_sg(priv->chan_tx, |
1007 | priv->sg_tx_p, nent, DMA_MEM_TO_DEV, | 1003 | priv->sg_tx_p, nent, DMA_MEM_TO_DEV, |
1008 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); | 1004 | DMA_PREP_INTERRUPT | DMA_CTRL_ACK); |
1009 | if (!desc) { | 1005 | if (!desc) { |