staging: comedi: remove comedi_error()

The comedi_error() function is just a wrapper around dev_err() that adds
the dev->driver->driver_name prefix to the message and a terminating
new-line character.

All of the users of this function have been converted to use dev_err()
directly. Remove the now unused function.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: Ian Abbott <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c
index 36862965051b012fdb4cc9601b714bb07d1163e9..630ef1fbb360ea9b9f074d5669c7327181ee0571 100644 (file)
--- a/drivers/staging/comedi/comedi_fops.c
+++ b/drivers/staging/comedi/comedi_fops.c
@@ -2401,12 +2401,6 @@ static const struct file_operations comedi_fops = {
        .llseek = noop_llseek,
 };
 
-void comedi_error(const struct comedi_device *dev, const char *s)
-{
-       dev_err(dev->class_dev, "%s: %s\n", dev->driver->driver_name, s);
-}
-EXPORT_SYMBOL_GPL(comedi_error);
-
 void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s)
 {
        struct comedi_async *async = s->async;

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index a7f24a9f0a23cd5d2f82d1f05862c06a2e4bcc7b..67cc8827a792e16a89d7ba701a6838b7ba07b7c0 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -280,7 +280,6 @@ static inline const void *comedi_board(const struct comedi_device *dev)
  */
 
 void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s);
-void comedi_error(const struct comedi_device *dev, const char *s);
 
 /* we can expand the number of bits used to encode devices/subdevices into
  the minor number soon, after more distros support > 8 bit minor numbers

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 299726f39e26d15a0ef45b9b068a02e7d62ce631..9bfd05b361ea801d83f1b241f5f2eaf2f22fa756 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -591,8 +591,6 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it)
                ret = -ENOSYS;
                goto out;
        }
-       /* initialize dev->driver here so
-        * comedi_error() can be called from attach */
        dev->driver = driv;
        dev->board_name = dev->board_ptr ? *(const char **)dev->board_ptr
                                         : dev->driver->driver_name;