pr_info(">> %s: creating workqueue <%s> for Port %d.\n",
                __func__, name, pi->portnum); /* RLD DEBUG */
 #endif
-       if (!(pi->wq_port = create_singlethread_workqueue(name)))
+       pi->wq_port = create_singlethread_workqueue(name);
+       if (!pi->wq_port)
                return -ENOMEM;
        return 0;                       /* success */
 }
        const struct c4_priv *priv = hdlc->priv;
        int         ret;
 
-       if ((ret = hdlc_open(ndev)))
-       {
+       ret = hdlc_open(ndev);
+       if (ret) {
                pr_info("hdlc_open failure, err %d.\n", ret);
                return ret;
        }
-       if ((ret = c4_chan_up(priv->ci, priv->channum)))
+
+       ret = c4_chan_up(priv->ci, priv->channum);
+       if (ret)
                return -ret;
        try_module_get(THIS_MODULE);
        netif_start_queue(ndev);
                                sizeof(struct sbecom_chan_param)))
                return -EFAULT;
 
-       if ((ret = mkret(c4_get_chan(cp.channum, &cp))))
+       ret = mkret(c4_get_chan(cp.channum, &cp));
+       if (ret)
                return ret;
 
        if (copy_to_user(data, &cp, sizeof(struct sbecom_chan_param)))
                return -EPERM;
        if (cmd != SIOCDEVPRIVATE + 15)
                return -EINVAL;
-       if (!(ci = get_ci_by_dev(ndev)))
+       ci = get_ci_by_dev(ndev);
+       if (!ci)
                return -EINVAL;
        if (ci->state != C_RUNNING)
                return -ENODEV;
        tasklet_enable(&ci->ci_musycc_isr_tasklet);
 #endif
 
-
-       if ((error_flag = c4_init2(ci)) != SBE_DRVR_SUCCESS)
-       {
+       error_flag = c4_init2(ci);
+       if (error_flag != SBE_DRVR_SUCCESS) {
 #ifdef CONFIG_PROC_FS
                sbecom_proc_brd_cleanup(ci);
 #endif
 {
        int         rtn;
 
-       if ((rtn = c4hw_attach_all()))
+       rtn = c4hw_attach_all();
+       if (rtn)
                return -rtn; /* installation failure - see system log */
 
        /* housekeeping notifications */
                {
                        ci = (ci_t *)(netdev_priv(hi->ndev));
                        for (j = 0; j < ci->max_port; j++)
-                               for (k = 0; k < MUSYCC_NCHANS; k++)
-                                       if ((ndev = ci->port[j].chan[k]->user))
+                               for (k = 0; k < MUSYCC_NCHANS; k++) {
+                                       ndev = ci->port[j].chan[k]->user;
+                                       if (ndev)
                                        {
                                                do_deluser(ndev, 0);
                                        }
+                               }
                }
        }
 }