staging: cxt1e1: Fix no spaces at the start of a line in linux.c
clean up checkpatch.pl warnings: WARNING: please no spaces at the start of a line in Signed-off-by: Daeseok Youn <daeseok.youn@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
922b81b835
commit
aa562fa709
|
@ -323,8 +323,10 @@ chan_dev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
|
|||
static int
|
||||
chan_attach_noop(struct net_device *ndev, unsigned short foo_1, unsigned short foo_2)
|
||||
{
|
||||
return 0; /* our driver has nothing to do here, show's
|
||||
* over, go home */
|
||||
/* our driver has nothing to do here, show's
|
||||
* over, go home
|
||||
*/
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
@ -484,19 +486,23 @@ create_chan(struct net_device *ndev, ci_t *ci,
|
|||
|
||||
hdlc->attach = chan_attach_noop;
|
||||
|
||||
rtnl_unlock(); /* needed due to Ioctl calling sequence */
|
||||
/* needed due to Ioctl calling sequence */
|
||||
rtnl_unlock();
|
||||
ret = register_hdlc_device(dev);
|
||||
/* NOTE: <stats> setting must occur AFTER registration in order to "take" */
|
||||
dev->tx_queue_len = MAX_DEFAULT_IFQLEN;
|
||||
|
||||
rtnl_lock(); /* needed due to Ioctl calling sequence */
|
||||
/* needed due to Ioctl calling sequence */
|
||||
rtnl_lock();
|
||||
if (ret)
|
||||
{
|
||||
if (cxt1e1_log_level >= LOG_WARN)
|
||||
pr_info("%s: create_chan[%d] registration error = %d.\n",
|
||||
ci->devname, cp->channum, ret);
|
||||
free_netdev(dev); /* cleanup */
|
||||
return NULL; /* failed to register */
|
||||
/* cleanup */
|
||||
free_netdev(dev);
|
||||
/* failed to register */
|
||||
return NULL;
|
||||
}
|
||||
return dev;
|
||||
}
|
||||
|
@ -1041,21 +1047,21 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1,
|
|||
{
|
||||
u_int32_t tmp;
|
||||
|
||||
hdw_sn_get(hi, brdno); /* also sets PROM format type (promfmt)
|
||||
* for later usage */
|
||||
/* also sets PROM format type (promfmt) for later usage */
|
||||
hdw_sn_get(hi, brdno);
|
||||
|
||||
switch (hi->promfmt)
|
||||
{
|
||||
case PROM_FORMAT_TYPE1:
|
||||
memcpy(ndev->dev_addr, (FLD_TYPE1 *) (hi->mfg_info.pft1.Serial), 6);
|
||||
memcpy(&tmp, (FLD_TYPE1 *) (hi->mfg_info.pft1.Id), 4); /* unaligned data
|
||||
* acquisition */
|
||||
/* unaligned data acquisition */
|
||||
memcpy(&tmp, (FLD_TYPE1 *) (hi->mfg_info.pft1.Id), 4);
|
||||
ci->brd_id = cpu_to_be32(tmp);
|
||||
break;
|
||||
case PROM_FORMAT_TYPE2:
|
||||
memcpy(ndev->dev_addr, (FLD_TYPE2 *) (hi->mfg_info.pft2.Serial), 6);
|
||||
memcpy(&tmp, (FLD_TYPE2 *) (hi->mfg_info.pft2.Id), 4); /* unaligned data
|
||||
* acquisition */
|
||||
/* unaligned data acquisition */
|
||||
memcpy(&tmp, (FLD_TYPE2 *) (hi->mfg_info.pft2.Id), 4);
|
||||
ci->brd_id = cpu_to_be32(tmp);
|
||||
break;
|
||||
default:
|
||||
|
@ -1065,11 +1071,12 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1,
|
|||
}
|
||||
|
||||
#if 1
|
||||
sbeid_set_hdwbid(ci); /* requires bid to be preset */
|
||||
/* requires bid to be preset */
|
||||
sbeid_set_hdwbid(ci);
|
||||
#else
|
||||
sbeid_set_bdtype(ci); /* requires hdw_bid to be preset */
|
||||
/* requires hdw_bid to be preset */
|
||||
sbeid_set_bdtype(ci);
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
|
@ -1090,7 +1097,8 @@ c4_add_dev(hdw_info_t *hi, int brdno, unsigned long f0, unsigned long f1,
|
|||
free_irq(irq0, ndev);
|
||||
OS_kfree(netdev_priv(ndev));
|
||||
OS_kfree(ndev);
|
||||
return NULL; /* failure, error_flag is set */
|
||||
/* failure, error_flag is set */
|
||||
return NULL;
|
||||
}
|
||||
return ndev;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue