Skip to content

Commit

Permalink
staging: dgnc: drop unused neo_uart_struct
Browse files Browse the repository at this point in the history
Now that the "neo" portion of the driver is gone (it was never being
used), drop the unused neo_uart_struct variable as well.

Cc: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Jan 17, 2018
1 parent e15f51d commit 2744c4d
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
2 changes: 0 additions & 2 deletions drivers/staging/dgnc/dgnc_driver.h
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ struct un_t {
* @ch_wopen: Waiting for open process count.
* @ch_mostat: FEP output modem status.
* @ch_mistat: FEP input modem status.
* @chc_neo_uart: Pointer to the mapped neo UART struct
* @ch_cls_uart: Pointer to the mapped cls UART struct
* @ch_cached_lsr: Cached value of the LSR register.
* @ch_rqueue: Read queue buffer, malloc'ed.
Expand Down Expand Up @@ -305,7 +304,6 @@ struct channel_t {
unsigned char ch_mostat;
unsigned char ch_mistat;

struct neo_uart_struct __iomem *ch_neo_uart;
struct cls_uart_struct __iomem *ch_cls_uart;

unsigned char ch_cached_lsr;
Expand Down
5 changes: 1 addition & 4 deletions drivers/staging/dgnc/dgnc_tty.c
Original file line number Diff line number Diff line change
Expand Up @@ -229,10 +229,7 @@ int dgnc_tty_init(struct dgnc_board *brd)
ch->ch_pun.un_type = DGNC_PRINT;
ch->ch_pun.un_dev = i + 128;

if (brd->bd_uart_offset == 0x200)
ch->ch_neo_uart = vaddr + (brd->bd_uart_offset * i);
else
ch->ch_cls_uart = vaddr + (brd->bd_uart_offset * i);
ch->ch_cls_uart = vaddr + (brd->bd_uart_offset * i);

ch->ch_bd = brd;
ch->ch_portnum = i;
Expand Down

0 comments on commit 2744c4d

Please sign in to comment.