staging: cxt1e1: fix checkpatch error 'assignment in if condition'
checkpatch.pl error in linux.c: ERROR: do not use assignment in if condition Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
12ca22b0d6
commit
ccf0119c95
1 changed files with 19 additions and 12 deletions
|
@ -228,7 +228,8 @@ c4_wq_port_init(mpi_t *pi)
|
||||||
pr_info(">> %s: creating workqueue <%s> for Port %d.\n",
|
pr_info(">> %s: creating workqueue <%s> for Port %d.\n",
|
||||||
__func__, name, pi->portnum); /* RLD DEBUG */
|
__func__, name, pi->portnum); /* RLD DEBUG */
|
||||||
#endif
|
#endif
|
||||||
if (!(pi->wq_port = create_singlethread_workqueue(name)))
|
pi->wq_port = create_singlethread_workqueue(name);
|
||||||
|
if (!pi->wq_port)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
return 0; /* success */
|
return 0; /* success */
|
||||||
}
|
}
|
||||||
|
@ -285,12 +286,14 @@ chan_open(struct net_device *ndev)
|
||||||
const struct c4_priv *priv = hdlc->priv;
|
const struct c4_priv *priv = hdlc->priv;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
if ((ret = hdlc_open(ndev)))
|
ret = hdlc_open(ndev);
|
||||||
{
|
if (ret) {
|
||||||
pr_info("hdlc_open failure, err %d.\n", ret);
|
pr_info("hdlc_open failure, err %d.\n", ret);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
if ((ret = c4_chan_up(priv->ci, priv->channum)))
|
|
||||||
|
ret = c4_chan_up(priv->ci, priv->channum);
|
||||||
|
if (ret)
|
||||||
return -ret;
|
return -ret;
|
||||||
try_module_get(THIS_MODULE);
|
try_module_get(THIS_MODULE);
|
||||||
netif_start_queue(ndev);
|
netif_start_queue(ndev);
|
||||||
|
@ -647,7 +650,8 @@ do_get_chan(struct net_device *ndev, void *data)
|
||||||
sizeof(struct sbecom_chan_param)))
|
sizeof(struct sbecom_chan_param)))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
||||||
if ((ret = mkret(c4_get_chan(cp.channum, &cp))))
|
ret = mkret(c4_get_chan(cp.channum, &cp));
|
||||||
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
if (copy_to_user(data, &cp, sizeof(struct sbecom_chan_param)))
|
if (copy_to_user(data, &cp, sizeof(struct sbecom_chan_param)))
|
||||||
|
@ -863,7 +867,8 @@ c4_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
|
||||||
return -EPERM;
|
return -EPERM;
|
||||||
if (cmd != SIOCDEVPRIVATE + 15)
|
if (cmd != SIOCDEVPRIVATE + 15)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (!(ci = get_ci_by_dev(ndev)))
|
ci = get_ci_by_dev(ndev);
|
||||||
|
if (!ci)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
if (ci->state != C_RUNNING)
|
if (ci->state != C_RUNNING)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
|
@ -1098,9 +1103,8 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1,
|
||||||
tasklet_enable(&ci->ci_musycc_isr_tasklet);
|
tasklet_enable(&ci->ci_musycc_isr_tasklet);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
error_flag = c4_init2(ci);
|
||||||
if ((error_flag = c4_init2(ci)) != SBE_DRVR_SUCCESS)
|
if (error_flag != SBE_DRVR_SUCCESS) {
|
||||||
{
|
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
sbecom_proc_brd_cleanup(ci);
|
sbecom_proc_brd_cleanup(ci);
|
||||||
#endif
|
#endif
|
||||||
|
@ -1120,7 +1124,8 @@ c4_mod_init(void)
|
||||||
{
|
{
|
||||||
int rtn;
|
int rtn;
|
||||||
|
|
||||||
if ((rtn = c4hw_attach_all()))
|
rtn = c4hw_attach_all();
|
||||||
|
if (rtn)
|
||||||
return -rtn; /* installation failure - see system log */
|
return -rtn; /* installation failure - see system log */
|
||||||
|
|
||||||
/* housekeeping notifications */
|
/* housekeeping notifications */
|
||||||
|
@ -1170,14 +1175,16 @@ cleanup_hdlc(void)
|
||||||
{
|
{
|
||||||
ci = (ci_t *)(netdev_priv(hi->ndev));
|
ci = (ci_t *)(netdev_priv(hi->ndev));
|
||||||
for (j = 0; j < ci->max_port; j++)
|
for (j = 0; j < ci->max_port; j++)
|
||||||
for (k = 0; k < MUSYCC_NCHANS; k++)
|
for (k = 0; k < MUSYCC_NCHANS; k++) {
|
||||||
if ((ndev = ci->port[j].chan[k]->user))
|
ndev = ci->port[j].chan[k]->user;
|
||||||
|
if (ndev)
|
||||||
{
|
{
|
||||||
do_deluser(ndev, 0);
|
do_deluser(ndev, 0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
static void __exit
|
static void __exit
|
||||||
|
|
Loading…
Add table
Reference in a new issue