git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers/ misc __iomem annotations
[safe/jmp/linux-2.6]
/
drivers
/
serial
/
68360serial.c
diff --git
a/drivers/serial/68360serial.c
b/drivers/serial/68360serial.c
index
4e56ec8
..
2aa6bfe
100644
(file)
--- a/
drivers/serial/68360serial.c
+++ b/
drivers/serial/68360serial.c
@@
-620,7
+620,7
@@
static void rs_360_interrupt(int vec, void *dev_id)
volatile struct smc_regs *smcp;
volatile struct scc_regs *sccp;
volatile struct smc_regs *smcp;
volatile struct scc_regs *sccp;
- info =
(ser_info_t *)
dev_id;
+ info = dev_id;
idx = PORT_NUM(info->state->smc_scc_num);
if (info->state->smc_scc_num & NUM_IS_SCC) {
idx = PORT_NUM(info->state->smc_scc_num);
if (info->state->smc_scc_num & NUM_IS_SCC) {
@@
-934,8
+934,6
@@
static void change_speed(ser_info_t *info)
/*
* Set up parity check flag
*/
/*
* Set up parity check flag
*/
-#define RELEVANT_IFLAG(iflag) (iflag & (IGNBRK|BRKINT|IGNPAR|PARMRK|INPCK))
-
info->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
if (I_INPCK(info->tty))
info->read_status_mask |= BD_SC_FR | BD_SC_PR;
info->read_status_mask = (BD_SC_EMPTY | BD_SC_OV);
if (I_INPCK(info->tty))
info->read_status_mask |= BD_SC_FR | BD_SC_PR;
@@
-1523,15
+1521,10
@@
static int rs_360_ioctl(struct tty_struct *tty, struct file * file,
/* FIX UP modem control here someday......
*/
/* FIX UP modem control here someday......
*/
-static void rs_360_set_termios(struct tty_struct *tty, struct termios *old_termios)
+static void rs_360_set_termios(struct tty_struct *tty, struct
k
termios *old_termios)
{
ser_info_t *info = (ser_info_t *)tty->driver_data;
{
ser_info_t *info = (ser_info_t *)tty->driver_data;
- if ( (tty->termios->c_cflag == old_termios->c_cflag)
- && ( RELEVANT_IFLAG(tty->termios->c_iflag)
- == RELEVANT_IFLAG(old_termios->c_iflag)))
- return;
-
change_speed(info);
#ifdef modem_control
change_speed(info);
#ifdef modem_control