提交 dcf1b0be 编写于 作者: J Jiri Kosina

trivial: don't touch drivers/staging

This is a partial revert of 421f91d2 ("fix typos concerning "initiali[zs]e"),
as we don't want to touch staging drivers from other trees than staging itself.
Signed-off-by: NJiri Kosina <jkosina@suse.cz>
上级 638c5945
...@@ -2085,7 +2085,7 @@ static int usbdux_pwm_start(struct comedi_device *dev, ...@@ -2085,7 +2085,7 @@ static int usbdux_pwm_start(struct comedi_device *dev,
if (ret < 0) if (ret < 0)
return ret; return ret;
/* initialise the buffer */ /* initalise the buffer */
for (i = 0; i < this_usbduxsub->sizePwmBuf; i++) for (i = 0; i < this_usbduxsub->sizePwmBuf; i++)
((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0; ((char *)(this_usbduxsub->urbPwm->transfer_buffer))[i] = 0;
......
...@@ -140,21 +140,21 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id, ...@@ -140,21 +140,21 @@ cvmx_cmd_queue_result_t cvmx_cmd_queue_initialize(cvmx_cmd_queue_id_t queue_id,
if (qstate->base_ptr_div128) { if (qstate->base_ptr_div128) {
if (max_depth != (int)qstate->max_depth) { if (max_depth != (int)qstate->max_depth) {
cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
"Queue already initialized with different " "Queue already initalized with different "
"max_depth (%d).\n", "max_depth (%d).\n",
(int)qstate->max_depth); (int)qstate->max_depth);
return CVMX_CMD_QUEUE_INVALID_PARAM; return CVMX_CMD_QUEUE_INVALID_PARAM;
} }
if (fpa_pool != qstate->fpa_pool) { if (fpa_pool != qstate->fpa_pool) {
cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
"Queue already initialized with different " "Queue already initalized with different "
"FPA pool (%u).\n", "FPA pool (%u).\n",
qstate->fpa_pool); qstate->fpa_pool);
return CVMX_CMD_QUEUE_INVALID_PARAM; return CVMX_CMD_QUEUE_INVALID_PARAM;
} }
if ((pool_size >> 3) - 1 != qstate->pool_size_m1) { if ((pool_size >> 3) - 1 != qstate->pool_size_m1) {
cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: " cvmx_dprintf("ERROR: cvmx_cmd_queue_initialize: "
"Queue already initialized with different " "Queue already initalized with different "
"FPA pool size (%u).\n", "FPA pool size (%u).\n",
(qstate->pool_size_m1 + 1) << 3); (qstate->pool_size_m1 + 1) << 3);
return CVMX_CMD_QUEUE_INVALID_PARAM; return CVMX_CMD_QUEUE_INVALID_PARAM;
......
...@@ -847,7 +847,7 @@ static void pohmelfs_destroy_inode(struct inode *inode) ...@@ -847,7 +847,7 @@ static void pohmelfs_destroy_inode(struct inode *inode)
} }
/* /*
* ->alloc_inode() callback. Allocates inode and initializes private data. * ->alloc_inode() callback. Allocates inode and initilizes private data.
*/ */
static struct inode *pohmelfs_alloc_inode(struct super_block *sb) static struct inode *pohmelfs_alloc_inode(struct super_block *sb)
{ {
......
...@@ -427,7 +427,7 @@ void RTMPToWirelessSta(struct rt_rtmp_adapter *pAd, ...@@ -427,7 +427,7 @@ void RTMPToWirelessSta(struct rt_rtmp_adapter *pAd,
/* /*
========================================================================== ==========================================================================
Description: Description:
This is a function to initialize 4-way handshake This is a function to initilize 4-way handshake
Return: Return:
...@@ -867,7 +867,7 @@ void PeerPairMsg3Action(struct rt_rtmp_adapter *pAd, ...@@ -867,7 +867,7 @@ void PeerPairMsg3Action(struct rt_rtmp_adapter *pAd,
========================================================================== ==========================================================================
Description: Description:
When receiving the last packet of 4-way pairwisekey handshake. When receiving the last packet of 4-way pairwisekey handshake.
Initialize 2-way groupkey handshake following. Initilize 2-way groupkey handshake following.
Return: Return:
========================================================================== ==========================================================================
*/ */
......
...@@ -501,13 +501,13 @@ SetRFPowerState8190( ...@@ -501,13 +501,13 @@ SetRFPowerState8190(
if((priv->ieee80211->eRFPowerState == eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) if((priv->ieee80211->eRFPowerState == eRfOff) && RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC))
{ // The current RF state is OFF and the RF OFF level is halting the NIC, re-initialize the NIC. { // The current RF state is OFF and the RF OFF level is halting the NIC, re-initialize the NIC.
bool rtstatus = true; bool rtstatus = true;
u32 InitializeCount = 3; u32 InitilizeCount = 3;
do do
{ {
InitializeCount--; InitilizeCount--;
priv->RegRfOff = false; priv->RegRfOff = false;
rtstatus = NicIFEnableNIC(dev); rtstatus = NicIFEnableNIC(dev);
}while( (rtstatus != true) &&(InitializeCount >0) ); }while( (rtstatus != true) &&(InitilizeCount >0) );
if(rtstatus != true) if(rtstatus != true)
{ {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册