staging: comedi: cleanup comedi_recognize()

This function is more complicated than it needs to be because of the
consts.  It's not worth saving them when we drop the consts anyway
when we return (void *)name_ptr.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc:
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 7289dcb..438c52a 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -304,14 +304,13 @@ static int postconfig(struct comedi_device *dev)
  * that register their supported board names */
 static void *comedi_recognize(struct comedi_driver *driv, const char *name)
 {
-       unsigned i;
-       const char *const *name_ptr = driv->board_name;
+       char **name_ptr = (char **)driv->board_name;
+       int i;
+
        for (i = 0; i < driv->num_names; i++) {
                if (strcmp(*name_ptr, name) == 0)
-                       return (void *)name_ptr;
-               name_ptr =
-                   (const char *const *)((const char *)name_ptr +
-                                         driv->offset);
+                       return name_ptr;
+               name_ptr = (void *)name_ptr + driv->offset;
        }
 
        return NULL;