diff options
| author |  Michael Straube <straube.linux@gmail.com>
| 2021-08-27 11:41:41 +0200 |
|---|---|---|
| committer |  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| 2021-08-27 16:16:19 +0200 |
| commit | a01b0006de7632656b2711b67c1d59b76af4d6a2 (patch) | |
| tree | 4fd335689cceb0a0662c575eb84d78d084ae9d8e /drivers/staging | |
| parent | staging: r8188eu: Provide a TODO file for this driver (diff) | |
| download | linux-a01b0006de7632656b2711b67c1d59b76af4d6a2.tar.gz linux-a01b0006de7632656b2711b67c1d59b76af4d6a2.tar.bz2 linux-a01b0006de7632656b2711b67c1d59b76af4d6a2.zip | |
staging: r8188eu: rename struct field Wifi_Error_Status
Rename struct field Wifi_Error_Status to avoid camel case.
Wifi_Error_Status -> wifi_error_status
Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210827094144.13290-2-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/r8188eu/core/rtw_sreset.c | 18 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/hal/usb_ops_linux.c | 4 | ||||
| -rw-r--r-- | drivers/staging/r8188eu/include/rtw_sreset.h | 2 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/staging/r8188eu/core/rtw_sreset.c b/drivers/staging/r8188eu/core/rtw_sreset.c index 8e1bc62e74e5..c831033d20a9 100644 --- a/drivers/staging/r8188eu/core/rtw_sreset.c +++ b/drivers/staging/r8188eu/core/rtw_sreset.c @@ -10,7 +10,7 @@ void sreset_init_value(struct adapter *padapter) _rtw_mutex_init(&psrtpriv->silentreset_mutex); psrtpriv->silent_reset_inprogress = false; - psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; + psrtpriv->wifi_error_status = WIFI_STATUS_SUCCESS; psrtpriv->last_tx_time = 0; psrtpriv->last_tx_complete_time = 0; } @@ -20,7 +20,7 @@ void sreset_reset_value(struct adapter *padapter) struct sreset_priv *psrtpriv = &pHalData->srestpriv; psrtpriv->silent_reset_inprogress = false; - psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; + psrtpriv->wifi_error_status = WIFI_STATUS_SUCCESS; psrtpriv->last_tx_time = 0; psrtpriv->last_tx_complete_time = 0; } @@ -37,20 +37,20 @@ u8 sreset_get_wifi_status(struct adapter *padapter) return status; val32 = rtw_read32(padapter, REG_TXDMA_STATUS); if (val32 == 0xeaeaeaea) { - psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST; + psrtpriv->wifi_error_status = WIFI_IF_NOT_EXIST; } else if (val32 != 0) { DBG_88E("txdmastatu(%x)\n", val32); - psrtpriv->Wifi_Error_Status = WIFI_MAC_TXDMA_ERROR; + psrtpriv->wifi_error_status = WIFI_MAC_TXDMA_ERROR; } - if (WIFI_STATUS_SUCCESS != psrtpriv->Wifi_Error_Status) { - DBG_88E("==>%s error_status(0x%x)\n", __func__, psrtpriv->Wifi_Error_Status); - status = (psrtpriv->Wifi_Error_Status & (~(USB_READ_PORT_FAIL | USB_WRITE_PORT_FAIL))); + if (WIFI_STATUS_SUCCESS != psrtpriv->wifi_error_status) { + DBG_88E("==>%s error_status(0x%x)\n", __func__, psrtpriv->wifi_error_status); + status = (psrtpriv->wifi_error_status & (~(USB_READ_PORT_FAIL | USB_WRITE_PORT_FAIL))); } DBG_88E("==> %s wifi_status(0x%x)\n", __func__, status); /* status restore */ - psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; + psrtpriv->wifi_error_status = WIFI_STATUS_SUCCESS; return status; } @@ -58,5 +58,5 @@ u8 sreset_get_wifi_status(struct adapter *padapter) void sreset_set_wifi_error_status(struct adapter *padapter, u32 status) { struct hal_data_8188e *pHalData = GET_HAL_DATA(padapter); - pHalData->srestpriv.Wifi_Error_Status = status; + pHalData->srestpriv.wifi_error_status = status; } diff --git a/drivers/staging/r8188eu/hal/usb_ops_linux.c b/drivers/staging/r8188eu/hal/usb_ops_linux.c index 5a55ee38d7b8..0cf69033c529 100644 --- a/drivers/staging/r8188eu/hal/usb_ops_linux.c +++ b/drivers/staging/r8188eu/hal/usb_ops_linux.c @@ -69,7 +69,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u16 value, void *pdata, adapt->bSurpriseRemoved = true; } else { struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); - haldata->srestpriv.Wifi_Error_Status = USB_VEN_REQ_CMD_FAIL; + haldata->srestpriv.wifi_error_status = USB_VEN_REQ_CMD_FAIL; } } else { /* status != len && status >= 0 */ if (status > 0) { @@ -417,7 +417,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) case -EOVERFLOW: { struct hal_data_8188e *haldata = GET_HAL_DATA(adapt); - haldata->srestpriv.Wifi_Error_Status = USB_READ_PORT_FAIL; + haldata->srestpriv.wifi_error_status = USB_READ_PORT_FAIL; } precvbuf->reuse = true; rtw_read_port(adapt, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); diff --git a/drivers/staging/r8188eu/include/rtw_sreset.h b/drivers/staging/r8188eu/include/rtw_sreset.h index 8fa7aa4abb3f..4e97997c305b 100644 --- a/drivers/staging/r8188eu/include/rtw_sreset.h +++ b/drivers/staging/r8188eu/include/rtw_sreset.h @@ -10,7 +10,7 @@ struct sreset_priv { struct mutex silentreset_mutex; u8 silent_reset_inprogress; - u8 Wifi_Error_Status; + u8 wifi_error_status; unsigned long last_tx_time; unsigned long last_tx_complete_time; }; |