staging: dgrp: fix some warnings

Just squashing these to get them out of the analysis queue.

nd_ps_desc is an array not a pointer so comparing it with NULL is silly (be
nice if gcc shouted about this). And there are some slightly pointless
comparisons too.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox 2012-10-11 17:21:03 +01:00 committed by Greg Kroah-Hartman
parent 69afc09042
commit 720a9bece0
3 changed files with 5 additions and 2 deletions

View File

@ -387,7 +387,7 @@ static long dgrp_dpa_ioctl(struct file *file, unsigned int cmd,
port = getchan.ch_port;
if (port < 0 || port > nd->nd_chan_count)
if (port > nd->nd_chan_count)
return -EINVAL;
ch = nd->nd_chan + port;

View File

@ -1671,6 +1671,9 @@ static int dgrp_send(struct nd_struct *nd, long tmax)
* do the job.
*/
/* FIXME: jiffies - ch->ch_waketime can never
be < 0. Someone needs to work out what is
actually intended here */
if (ch->ch_pun.un_open_count &&
(ch->ch_pun.un_flag &
(UN_EMPTY|UN_TIME|UN_LOW|UN_PWAIT)) != 0) {

View File

@ -177,7 +177,7 @@ static ssize_t dgrp_node_description_show(struct device *c,
if (!nd)
return 0;
if (nd->nd_state == NS_READY && nd->nd_ps_desc)
if (nd->nd_state == NS_READY)
return snprintf(buf, PAGE_SIZE, "%s\n", nd->nd_ps_desc);
return 0;
}