gigaset: get rid of info() and warn() macros

[~andy/linux] / drivers / isdn / gigaset / ser-gigaset.c

diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c
index 07052ed2a0c56d46480cb04c375df1afc3779d31..b306a2ff7312ded8f70d80610eb539f59138244e 100644 (file)
--- a/drivers/isdn/gigaset/ser-gigaset.c
+++ b/drivers/isdn/gigaset/ser-gigaset.c
@@ -16,7 +16,6 @@
 #include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/tty.h>
-#include <linux/poll.h>
 #include <linux/completion.h>
 
 /* Version Information */
@@ -514,8 +513,7 @@ gigaset_tty_open(struct tty_struct *tty)
 
        gig_dbg(DEBUG_INIT, "Starting HLL for Gigaset M101");
 
-       info(DRIVER_AUTHOR);
-       info(DRIVER_DESC);
+       printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");
 
        if (!driver) {
                err("%s: no driver structure", __func__);
@@ -571,7 +569,6 @@ gigaset_tty_close(struct tty_struct *tty)
        }
 
        /* prevent other callers from entering ldisc methods */
-       /* FIXME: should use the tty state flags */
        tty->disc_data = NULL;
 
        if (!cs->hw.ser)
@@ -672,18 +669,6 @@ gigaset_tty_ioctl(struct tty_struct *tty, struct file *file,
        return rc;
 }
 
-/*
- * Poll on the tty.
- * Unused, always return zero.
- *
- * FIXME: should probably return an exception - especially on hangup
- */
-static unsigned int
-gigaset_tty_poll(struct tty_struct *tty, struct file *file, poll_table *wait)
-{
-       return 0;
-}
-
 /*
  * Called by the tty driver when a block of data has been received.
  * Will not be re-entered while running but other ldisc functions
@@ -773,7 +758,6 @@ static struct tty_ldisc_ops gigaset_ldisc = {
        .read           = gigaset_tty_read,
        .write          = gigaset_tty_write,
        .ioctl          = gigaset_tty_ioctl,
-       .poll           = gigaset_tty_poll,
        .receive_buf    = gigaset_tty_receive,
        .write_wakeup   = gigaset_tty_wakeup,
 };