Skip to content

Commit

Permalink
staging: comedi: cleanup comedi_recognize()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Jun 5, 2012
1 parent 5254cbe commit 1c9de58
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions drivers/staging/comedi/drivers.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 1c9de58

Please sign in to comment.