Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 54829
b: refs/heads/master
c: cab9bdd
h: refs/heads/master
i:
  54827: 790766f
v: v3
  • Loading branch information
Jiri Slaby authored and Linus Torvalds committed May 8, 2007
1 parent bb865da commit 59a60af
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ad39c3004971173baeca80173e77022ee03eb9a1
refs/heads/master: cab9bdd14dd7d8091b0aac7877ae9f29724eb741
38 changes: 19 additions & 19 deletions trunk/drivers/char/cyclades.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2636,7 +2636,7 @@ static int cy_open(struct tty_struct *tty, struct file *filp)
*/
static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
void __iomem *base_addr;
int card, chip, channel, index;
unsigned long orig_jiffies;
Expand Down Expand Up @@ -2713,7 +2713,7 @@ static void cy_wait_until_sent(struct tty_struct *tty, int timeout)
*/
static void cy_close(struct tty_struct *tty, struct file *filp)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
unsigned long flags;

#ifdef CY_DEBUG_OTHER
Expand Down Expand Up @@ -2858,7 +2858,7 @@ static void cy_close(struct tty_struct *tty, struct file *filp)
*/
static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
unsigned long flags;
int c, ret = 0;

Expand Down Expand Up @@ -2909,7 +2909,7 @@ static int cy_write(struct tty_struct *tty, const unsigned char *buf, int count)
*/
static void cy_put_char(struct tty_struct *tty, unsigned char ch)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
unsigned long flags;

#ifdef CY_DEBUG_IO
Expand Down Expand Up @@ -2942,7 +2942,7 @@ static void cy_put_char(struct tty_struct *tty, unsigned char ch)
*/
static void cy_flush_chars(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;

#ifdef CY_DEBUG_IO
printk("cyc:cy_flush_chars ttyC%d\n", info->line); /* */
Expand All @@ -2966,7 +2966,7 @@ static void cy_flush_chars(struct tty_struct *tty)
*/
static int cy_write_room(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
int ret;

#ifdef CY_DEBUG_IO
Expand All @@ -2983,7 +2983,7 @@ static int cy_write_room(struct tty_struct *tty)

static int cy_chars_in_buffer(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
int card, channel;

if (serial_paranoia_check(info, tty->name, "cy_chars_in_buffer"))
Expand Down Expand Up @@ -3572,7 +3572,7 @@ static int get_lsr_info(struct cyclades_port *info, unsigned int __user * value)

static int cy_tiocmget(struct tty_struct *tty, struct file *file)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
int card, chip, channel, index;
void __iomem *base_addr;
unsigned long flags;
Expand Down Expand Up @@ -3646,7 +3646,7 @@ static int
cy_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
int card, chip, channel, index;
void __iomem *base_addr;
unsigned long flags;
Expand Down Expand Up @@ -3797,7 +3797,7 @@ cy_tiocmset(struct tty_struct *tty, struct file *file,
*/
static void cy_break(struct tty_struct *tty, int break_state)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
unsigned long flags;

if (serial_paranoia_check(info, tty->name, "cy_break"))
Expand Down Expand Up @@ -3997,7 +3997,7 @@ static int
cy_ioctl(struct tty_struct *tty, struct file *file,
unsigned int cmd, unsigned long arg)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
struct cyclades_icount cprev, cnow; /* kernel counter temps */
struct serial_icounter_struct __user *p_cuser; /* user space */
int ret_val = 0;
Expand Down Expand Up @@ -4190,7 +4190,7 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
*/
static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;

#ifdef CY_DEBUG_OTHER
printk("cyc:cy_set_termios ttyC%d\n", info->line);
Expand Down Expand Up @@ -4225,7 +4225,7 @@ static void cy_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
*/
static void cy_send_xchar(struct tty_struct *tty, char ch)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
int card, channel;

if (serial_paranoia_check(info, tty->name, "cy_send_xchar"))
Expand Down Expand Up @@ -4255,7 +4255,7 @@ static void cy_send_xchar(struct tty_struct *tty, char ch)
*/
static void cy_throttle(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
unsigned long flags;
void __iomem *base_addr;
int card, chip, channel, index;
Expand Down Expand Up @@ -4313,7 +4313,7 @@ static void cy_throttle(struct tty_struct *tty)
*/
static void cy_unthrottle(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
unsigned long flags;
void __iomem *base_addr;
int card, chip, channel, index;
Expand Down Expand Up @@ -4369,7 +4369,7 @@ static void cy_unthrottle(struct tty_struct *tty)
static void cy_stop(struct tty_struct *tty)
{
struct cyclades_card *cinfo;
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
void __iomem *base_addr;
int chip, channel, index;
unsigned long flags;
Expand Down Expand Up @@ -4404,7 +4404,7 @@ static void cy_stop(struct tty_struct *tty)
static void cy_start(struct tty_struct *tty)
{
struct cyclades_card *cinfo;
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
void __iomem *base_addr;
int chip, channel, index;
unsigned long flags;
Expand Down Expand Up @@ -4437,7 +4437,7 @@ static void cy_start(struct tty_struct *tty)

static void cy_flush_buffer(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;
int card, channel, retval;
unsigned long flags;

Expand Down Expand Up @@ -4474,7 +4474,7 @@ static void cy_flush_buffer(struct tty_struct *tty)
*/
static void cy_hangup(struct tty_struct *tty)
{
struct cyclades_port *info = (struct cyclades_port *)tty->driver_data;
struct cyclades_port *info = tty->driver_data;

#ifdef CY_DEBUG_OTHER
printk("cyc:cy_hangup ttyC%d\n", info->line); /* */
Expand Down

0 comments on commit 59a60af

Please sign in to comment.