Re: [4/4] mwifiex: pcie: de-duplicate buffer allocation code
From: Brian Norris
Date: Thu May 18 2017 - 12:30:47 EST
On Thu, May 18, 2017 at 01:33:48PM +0000, Kalle Valo wrote:
> Brian Norris <briannorris@xxxxxxxxxxxx> wrote:
> > This code was duplicated as part of the PCIe FLR code added to this
> > driver. Let's de-duplicate it to:
> > * make things easier to read (mwifiex_pcie_free_buffers() now has a
> > corresponding mwifiex_pcie_alloc_buffers())
> > * reduce likelihood of bugs
> > * make error logging equally verbose
> > * save lines of code!
> > Also drop some of the commentary that isn't really needed.
> > Signed-off-by: Brian Norris <briannorris@xxxxxxxxxxxx>
> Failed to apply:
> fatal: sha1 information is lacking or useless (drivers/net/wireless/marvell/mwifiex/pcie.c).
> error: could not build fake ancestor
> Applying: mwifiex: pcie: de-duplicate buffer allocation code
> Patch failed at 0001 mwifiex: pcie: de-duplicate buffer allocation code
> The copy of the patch that failed is found in: .git/rebase-apply/patch
Hmm, well it still applies for me, but it does require a 3-way merge...
and I guess I have local history (because the 3 previous patches *used*
to be together...):
$ pwclient git-am -p linux-wireless 9618309
Applying patch #9618309 using u'git am'
Description: [4/4] mwifiex: pcie: de-duplicate buffer allocation code
Applying: mwifiex: pcie: de-duplicate buffer allocation code
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Anyway, I'll resend.
> Patch set to Changes Requested.