Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-10 07:50:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

goldfish: clean up tty 64bit support

Browse Source 
Use the helper we now have available.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan 2014-05-12 16:57:05 +01:00 committed by Greg Kroah-Hartman
parent f6279717bb
commit e0f682e05f
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tty/goldfish.c
View File

@ -21,6 +21,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/goldfish.h>
enum { enum {
GOLDFISH_TTY_PUT_CHAR = 0x00, GOLDFISH_TTY_PUT_CHAR = 0x00,
@ -29,9 +30,7 @@ enum {
GOLDFISH_TTY_DATA_PTR = 0x10, GOLDFISH_TTY_DATA_PTR = 0x10,
GOLDFISH_TTY_DATA_LEN = 0x14, GOLDFISH_TTY_DATA_LEN = 0x14,
#ifdef CONFIG_64BIT
GOLDFISH_TTY_DATA_PTR_HIGH = 0x18, GOLDFISH_TTY_DATA_PTR_HIGH = 0x18,
#endif
GOLDFISH_TTY_CMD_INT_DISABLE = 0, GOLDFISH_TTY_CMD_INT_DISABLE = 0,
GOLDFISH_TTY_CMD_INT_ENABLE = 1, GOLDFISH_TTY_CMD_INT_ENABLE = 1,
@ -60,10 +59,8 @@ static void goldfish_tty_do_write(int line, const char *buf, unsigned count)
struct goldfish_tty *qtty = &goldfish_ttys[line]; struct goldfish_tty *qtty = &goldfish_ttys[line];
void __iomem *base = qtty->base; void __iomem *base = qtty->base;
spin_lock_irqsave(&qtty->lock, irq_flags); spin_lock_irqsave(&qtty->lock, irq_flags);
writel((u32)buf, base + GOLDFISH_TTY_DATA_PTR); gf_write64((u64)buf, base + GOLDFISH_TTY_DATA_PTR,
#ifdef CONFIG_64BIT base + GOLDFISH_TTY_DATA_PTR_HIGH);
writel((u32)((u64)buf >> 32), base + GOLDFISH_TTY_DATA_PTR_HIGH);
#endif
writel(count, base + GOLDFISH_TTY_DATA_LEN); writel(count, base + GOLDFISH_TTY_DATA_LEN);
writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_CMD); writel(GOLDFISH_TTY_CMD_WRITE_BUFFER, base + GOLDFISH_TTY_CMD);
spin_unlock_irqrestore(&qtty->lock, irq_flags); spin_unlock_irqrestore(&qtty->lock, irq_flags);
@ -84,10 +81,8 @@ static irqreturn_t goldfish_tty_interrupt(int irq, void *dev_id)
count = tty_prepare_flip_string(&qtty->port, &buf, count); count = tty_prepare_flip_string(&qtty->port, &buf, count);
spin_lock_irqsave(&qtty->lock, irq_flags); spin_lock_irqsave(&qtty->lock, irq_flags);
writel((u32)buf, base + GOLDFISH_TTY_DATA_PTR); gf_write64((u64)buf, base + GOLDFISH_TTY_DATA_PTR,
#ifdef CONFIG_64BIT base + GOLDFISH_TTY_DATA_PTR_HIGH);
writel((u32)((u64)buf >> 32), base + GOLDFISH_TTY_DATA_PTR_HIGH);
#endif
writel(count, base + GOLDFISH_TTY_DATA_LEN); writel(count, base + GOLDFISH_TTY_DATA_LEN);
writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD); writel(GOLDFISH_TTY_CMD_READ_BUFFER, base + GOLDFISH_TTY_CMD);
spin_unlock_irqrestore(&qtty->lock, irq_flags); spin_unlock_irqrestore(&qtty->lock, irq_flags);