Skip to content

Commit

Permalink
Staging: comedi: cleanup: remove unneeded null checks
Browse files Browse the repository at this point in the history
These checks are obviously pointless because kfree() can handle null
dereferences.

But really the main problem is that if the pointers were null that would
cause problems on the ealier lines.  The dereferences would cause an
oops and the _release() functions use ->priv to determine which IRQ to
free.  I looked into it and quite a few of the detach functions assume
link->priv is non-null.  It seems like we can remove these checks.

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Dan Carpenter authored and Greg Kroah-Hartman committed Jun 17, 2010
1 parent c5da209 commit f25bd6b
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 10 deletions.
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/cb_das16_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -719,8 +719,7 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link)
((struct local_info_t *)link->priv)->stop = 1;
das16cs_pcmcia_release(link);
/* This points to the parent struct local_info_t struct */
if (link->priv)
kfree(link->priv);
kfree(link->priv);
} /* das16cs_pcmcia_detach */


Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/das08_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,7 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
das08_pcmcia_release(link);

/* This points to the parent struct local_info_t struct */
if (link->priv)
kfree(link->priv);
kfree(link->priv);

} /* das08_pcmcia_detach */

Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/ni_daq_700.c
Original file line number Diff line number Diff line change
Expand Up @@ -537,8 +537,7 @@ static void dio700_cs_detach(struct pcmcia_device *link)
dio700_release(link);

/* This points to the parent struct local_info_t struct */
if (link->priv)
kfree(link->priv);
kfree(link->priv);

} /* dio700_cs_detach */

Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/ni_daq_dio24.c
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,7 @@ static void dio24_cs_detach(struct pcmcia_device *link)
dio24_release(link);

/* This points to the parent local_info_t struct */
if (link->priv)
kfree(link->priv);
kfree(link->priv);

} /* dio24_cs_detach */

Expand Down
3 changes: 1 addition & 2 deletions drivers/staging/comedi/drivers/quatech_daqp_cs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1076,8 +1076,7 @@ static void daqp_cs_detach(struct pcmcia_device *link)

/* Unlink device structure, and free it */
dev_table[dev->table_index] = NULL;
if (dev)
kfree(dev);
kfree(dev);

} /* daqp_cs_detach */

Expand Down

0 comments on commit f25bd6b

Please sign in to comment.