diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-05-26 12:14:45 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-05 03:33:39 (GMT) |
| commit | 1c9de58acc06cba56b5f1bd17a5a74a66427f8b1 (patch) | |
| tree | fde995a5ebc027d32eb27fb1edbbd160ec228a98 /drivers/staging/comedi/drivers.c | |
| parent | 5254cbe795c3bb9ef28d61a474d707385fc87178 (diff) | |
| download | linux-fsl-qoriq-1c9de58acc06cba56b5f1bd17a5a74a66427f8b1.tar.xz | |
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>
Diffstat (limited to 'drivers/staging/comedi/drivers.c')
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 7289dcb..438c52a 100644 --- 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; |