Amitkumar Karwar <[email protected]> writes: > Hi Kalle, > >> From: Kalle Valo [mailto:[email protected]] >> Sent: Thursday, January 12, 2017 8:25 PM >> To: Amitkumar Karwar >> Cc: [email protected]; Cathy Luo; Nishant Sarmukadam; >> [email protected]; [email protected]; [email protected]; >> Xinming Hu >> Subject: Re: [1/2] mwifiex: code rearrangement in pcie.c and sdio.c >> >> Amitkumar Karwar <[email protected]> writes: >> >> >> But these didn't. Can you please rebase these and resubmit in one >> >> patchset? Less conflicts that way. >> >> >> > >> > The problem here is you tried to apply the patches in reverse order. >> Sorry for the confusion. >> > Please apply pending patches in below order. >> > >> > [v3,1/5] mwifiex: don't wait for main_process in shutdown_drv --- >> Apply this patch first. >> > [v3,2/5] mwifiex: do not free firmware dump memory in shutdown_drv >> > [v3,3/5] mwifiex: get rid of drv_info* adapter variables [v3,4/5] >> > mwifiex: wait firmware dump complete during card remove process >> > [v3,5/5] mwifiex: move pcie_work and related variables inside card >> > >> > [1/2] mwifiex: code rearrangement in pcie.c and sdio.c [2/2] mwifiex: >> > get rid of global user_rmmod flag >> > >> > mwifiex: use module_*_driver helper macros >> > >> > [1/5] mwifiex: get rid of mwifiex_do_flr wrapper [2/5] mwifiex: >> > cleanup in PCIe flr code path [3/5] mwifiex: sdio card reset >> > enhancement [4/5] mwifiex: get rid of __mwifiex_sdio_remove helper >> > [5/5] mwifiex: get rid of global save_adapter and sdio_work >> >> Thanks, now I was able to apply these but please do double check the >> result in wireless-drivers-next. >> >> I also noticed a new warning: >> >> drivers/net/wireless/marvell/mwifiex/pcie.c: In function >> 'mwifiex_pcie_remove': >> drivers/net/wireless/marvell/mwifiex/pcie.c:303:5: warning: 'fw_status' >> may be used uninitialized in this function [-Wmaybe-uninitialized] >> if (fw_status == FIRMWARE_READY_PCIE && !adapter->mfg_mode) { >> >> Actually I'm not sure if this warning was caused by these patches as I >> have recently updated my ancient gcc to a newer one (5.4.0), but please >> take a look and send a fix if it's a valid warning. >> > > Below CL fixes this warning. > > https://patchwork.kernel.org/patch/9515899/
Good, thanks. I'll apply that shortly. -- Kalle Valo
