Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 146248
b: refs/heads/master
c: b39933f
h: refs/heads/master
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed Jun 11, 2009
1 parent eb1c962 commit a325445
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 963118eef9e6706e2b5356309fb0cdd9c9eba81d
refs/heads/master: b39933fbd304021580800796683b8ddaa3dd0a6a
6 changes: 0 additions & 6 deletions trunk/drivers/char/cyclades.c
Original file line number Diff line number Diff line change
Expand Up @@ -2963,7 +2963,6 @@ static void set_line_char(struct cyclades_port *info)
void __iomem *base_addr;
int chip, channel, index;
unsigned cflag, iflag;
unsigned short chip_number;
int baud, baud_rate = 0;
int i;

Expand Down Expand Up @@ -2992,7 +2991,6 @@ static void set_line_char(struct cyclades_port *info)

card = info->card;
channel = info->line - card->first_line;
chip_number = channel / 4;

if (!cy_is_Z(card)) {

Expand Down Expand Up @@ -3212,9 +3210,7 @@ static void set_line_char(struct cyclades_port *info)
} else {
struct FIRM_ID __iomem *firm_id;
struct ZFW_CTRL __iomem *zfw_ctrl;
struct BOARD_CTRL __iomem *board_ctrl;
struct CH_CTRL __iomem *ch_ctrl;
struct BUF_CTRL __iomem *buf_ctrl;
__u32 sw_flow;
int retval;

Expand All @@ -3224,9 +3220,7 @@ static void set_line_char(struct cyclades_port *info)

zfw_ctrl = card->base_addr +
(readl(&firm_id->zfwctrl_addr) & 0xfffff);
board_ctrl = &zfw_ctrl->board_ctrl;
ch_ctrl = &(zfw_ctrl->ch_ctrl[channel]);
buf_ctrl = &zfw_ctrl->buf_ctrl[channel];

/* baud rate */
baud = tty_get_baud_rate(info->port.tty);
Expand Down

0 comments on commit a325445

Please sign in to comment.