Hi Atle,
Atle Nissestad wrote:
Update Nios2 serial driver for kernel 2.6.23
Signed-off-by: Atle Nissestad <[EMAIL PROTECTED]>
Applied, thanks.
Regards
Greg
diff --git a/linux-2.6.x/drivers/serial/NIOSserial.c
b/linux-2.6.x/drivers/serial/NIOSserial.c
index 5b3df6a..9c14748 100644
--- a/linux-2.6.x/drivers/serial/NIOSserial.c
+++ b/linux-2.6.x/drivers/serial/NIOSserial.c
@@ -351,9 +351,9 @@ irqreturn_t rs_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
-static void do_softint(void *private)
+static void do_softint(struct work_struct *work)
{
- struct NIOS_serial *info = (struct NIOS_serial *) private;
+ struct NIOS_serial *info = container_of(work,struct NIOS_serial,
tqueue);
struct tty_struct *tty;
tty = info->tty;
@@ -371,9 +371,9 @@ static void do_softint(void *private)
* do_serial_hangup() -> tty->hangup() -> rs_hangup()
*
*/
-static void do_serial_hangup(void *private_)
+static void do_serial_hangup(struct work_struct *work_)
{
- struct NIOS_serial *info = (struct NIOS_serial *) private_;
+ struct NIOS_serial *info = container_of(work_,struct NIOS_serial,
tqueue_hangup);
struct tty_struct *tty;
tty = info->tty;
--
------------------------------------------------------------------------
Greg Ungerer -- Chief Software Dude EMAIL: [EMAIL PROTECTED]
Secure Computing Corporation PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
_______________________________________________
uClinux-dev mailing list
[email protected]
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by [email protected]
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
