Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[4.14] Fix GCC 6.4.0 and 7.3.0 warnings #2413

Merged
merged 5 commits into from
Mar 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion drivers/net/wireless/realtek/rtl8192cu/core/rtw_mlme_ext.c
Original file line number Diff line number Diff line change
Expand Up @@ -733,9 +733,10 @@ void mgt_dispatcher(_adapter *padapter, union recv_frame *precv_frame)
case WIFI_AUTH:
if(check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE)
ptable->func = &OnAuth;
/* falls through */
else
ptable->func = &OnAuthClient;
//pass through
/* falls through */
case WIFI_ASSOCREQ:
case WIFI_REASSOCREQ:
_mgt_dispatcher(padapter, ptable, precv_frame);
Expand Down
10 changes: 5 additions & 5 deletions drivers/net/wireless/realtek/rtl8192cu/core/rtw_security.c
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ _func_enter_;
bitwise_xor(aes_out, mic_header2, chain_buffer);
aes128k128d(key, chain_buffer, aes_out);

for (i = 0; i < num_blocks; i++)
for (i = 0; i < num_blocks; i++)
{
bitwise_xor(aes_out, &pframe[payload_index], chain_buffer);//bitwise_xor(aes_out, &message[payload_index], chain_buffer);

Expand All @@ -1504,8 +1504,8 @@ _func_enter_;
for (j = 0; j < 8; j++)
pframe[payload_index+j] = mic[j]; //message[payload_index+j] = mic[j];

payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++)
payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++)
{
construct_ctr_preload(
ctr_preload,
Expand Down Expand Up @@ -1878,8 +1878,8 @@ _func_enter_;
for (j = 0; j < 8; j++)
message[payload_index+j] = mic[j];

payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++)
payload_index = hdrlen + 8;
for (i=0; i< num_blocks; i++)
{
construct_ctr_preload(
ctr_preload,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2363,6 +2363,7 @@ phy_TxPwrIdxToDbm(
case WIRELESS_MODE_G:
case WIRELESS_MODE_N_24G:
Offset = -8;
break;
default:
Offset = -8;
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5692,6 +5692,7 @@ _func_enter_;
{
case HW_VAR_BASIC_RATE:
*((u16 *)(val)) = pHalData->BasicRateSet;
/* falls through */
case HW_VAR_TXPAUSE:
val[0] = rtw_read8(Adapter, REG_TXPAUSE);
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
case _TKIP_WTMIC_:
case _AES_:
keylen = 16;
break;
default:
keylen = 16;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7381,6 +7381,7 @@ static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
case _TKIP_WTMIC_:
case _AES_:
keylen = 16;
break;
default:
keylen = 16;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1732,7 +1732,6 @@ vchiq_open(struct inode *inode, struct file *file)
vchiq_log_info(vchiq_arm_log_level, "vchiq_open");
switch (dev) {
case VCHIQ_MINOR: {
int ret;
VCHIQ_STATE_T *state = vchiq_get_state();
VCHIQ_INSTANCE_T instance;

Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/host/dwc_otg/dwc_otg_fiq_fsm.c
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,8 @@ static int notrace noinline fiq_fsm_update_hs_isoc(struct fiq_state *state, int
}

} else {
switch (st->hcchar_copy.b.multicnt) {
st->hctsiz_copy.b.xfersize = nrpackets * st->hcchar_copy.b.mps;
switch (st->hcchar_copy.b.multicnt) {
case 1:
st->hctsiz_copy.b.pid = DWC_PID_DATA0;
break;
Expand Down
3 changes: 1 addition & 2 deletions sound/soc/bcm/allo-piano-dac-plus.c
Original file line number Diff line number Diff line change
Expand Up @@ -704,11 +704,10 @@ static int snd_allo_piano_dac_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_card *card = rtd->card;
struct glb_pool *glb_ptr;

glb_ptr = kmalloc(sizeof(struct glb_pool), GFP_KERNEL);
glb_ptr = kzalloc(sizeof(struct glb_pool), GFP_KERNEL);
if (!glb_ptr)
return -ENOMEM;

memset(glb_ptr, 0x00, sizeof(glb_ptr));
card->drvdata = glb_ptr;
glb_ptr->dual_mode = 2;
glb_ptr->set_mode = 0;
Expand Down