2.5.34 s390 fixes (9/10): ctc driver.
Subsystems (3)
PATCH 1/1 2.5.34 s390 fixes (9/10): ctc driver.
Hi Linus,
replace old style bottom half by a tasklet in the ctc driver.
blue skies,
Martin.
drivers/s390/net/ctcmain.c +1 -0
@@ -49,6 +49,7 @@#include <linux/interrupt.h> #include <linux/timer.h> #include <linux/sched.h> +#include <linux/tqueue.h> #include <linux/signal.h> #include <linux/string.h>
drivers/s390/net/ctctty.c +11 -26
@@ -86,7 +86,7 @@wait_queue_head_t open_wait;wait_queue_head_t close_wait;struct semaphore write_sem; -struct tq_struct tq; +struct tasklet_struct tasklet;struct timer_list stoptimer; } ctc_tty_info;
@@ -272,8 +272,7 @@*/ skb_queue_tail (&info->rx_queue, skb);/* Schedule dequeuing */ -queue_task (&info->tq, &tq_immediate); -mark_bh (IMMEDIATE_BH ); +tasklet_schedule (&info->tasklet); } static int
@@ -390,8 +389,7 @@skb_reserve (skb, skb_res); *(skb_put (skb,1 )) = c;skb_queue_head (&info->tx_queue, skb); -queue_task (&info->tq, &tq_immediate); -mark_bh (IMMEDIATE_BH ); +tasklet_schedule (&info->tasklet); } static void
@@ -400,8 +398,7 @@if (ctc_tty_shuttingdown)return ; info->flags |=CTC_ASYNC_TX_LINESTAT ; -queue_task (&info->tq, &tq_immediate); -mark_bh (IMMEDIATE_BH ); +tasklet_schedule (&info->tasklet); } static void
@@ -562,8 +559,7 @@ }if (skb_queue_len (&info->tx_queue)) { info->lsr &= ~UART_LSR_TEMT ; -queue_task (&info->tq, &tq_immediate); -mark_bh (IMMEDIATE_BH ); +tasklet_schedule (&info->tasklet); }if (from_user)up (&info->write_sem);
@@ -628,8 +624,7 @@return ;if (tty->stopped || tty->hw_stopped || (!skb_queue_len (&info->tx_queue)))return ; -queue_task (&info->tq, &tq_immediate); -mark_bh (IMMEDIATE_BH ); +tasklet_schedule (&info->tasklet); }/*
@@ -1170,8 +1165,9 @@* the lower levels. */ static void -ctc_tty_task (ctc_tty_info *info) +ctc_tty_task (unsigned long arg) { +ctc_tty_info *info = (void *)arg;unsigned long saveflags;int again;
@@ -1182,8 +1178,7 @@ info->lsr |=UART_LSR_TEMT ; again |=ctc_tty_readmodem (info);if (again) { -queue_task (&info->tq, &tq_immediate); -mark_bh (IMMEDIATE_BH ); +tasklet_schedule (&info->tasklet); } }spin_unlock_irqrestore (&ctc_tty_lock, saveflags);
@@ -1243,14 +1238,8 @@for (i =0 ; i <CTC_TTY_MAX_DEVICES ; i++) { info = &driver->info[i];init_MUTEX (&info->write_sem); -#if LINUX_VERSION_CODE >=0x020400 -INIT_LIST_HEAD (&info->tq.list); -#else - info->tq.next =NULL ; -#endif - info->tq.sync =0 ; - info->tq.routine = (void *)(void *)ctc_tty_task; - info->tq.data = info; +tasklet_init (&info->tasklet, ctc_tty_task, + (unsigned long ) info); info->magic =CTC_ASYNC_MAGIC ; info->line = i; info->tty =0 ;
@@ -1331,10 +1320,6 @@kfree (driver); driver =NULL ; }else { -int i; - -for (i =0 ; i <CTC_TTY_MAX_DEVICES ; i++) - driver->info[i].tq.routine =NULL ;tty_unregister_driver (&driver->ctc_tty_device); }spin_unlock_irqrestore (&ctc_tty_lock, saveflags);