Commit f25bd6bf authored by Dan Carpenter's avatar Dan Carpenter Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: cleanup: remove unneeded null checks 



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: default avatarDan Carpenter <error27@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c5da2090

drivers/staging/comedi/drivers/cb_das16_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -719,7 +719,6 @@ 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);

}				/* das16cs_pcmcia_detach */

drivers/staging/comedi/drivers/das08_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ 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);



}				/* das08_pcmcia_detach */

drivers/staging/comedi/drivers/ni_daq_700.c

+1 −2
Original line number Diff line number Diff line
@@ -537,7 +537,6 @@ 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);



}				/* dio700_cs_detach */

drivers/staging/comedi/drivers/ni_daq_dio24.c

+1 −2
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ 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);



}				/* dio24_cs_detach */

drivers/staging/comedi/drivers/quatech_daqp_cs.c

+1 −2
Original line number Diff line number Diff line
@@ -1076,7 +1076,6 @@ 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);



}				/* daqp_cs_detach */

CRA Git | Maintained and supported by SUSTech CRA and CCSE