On Fri, May 15, 2020 at 03:53:59PM +0200, Greg Kroah-Hartman wrote: > On Fri, May 15, 2020 at 10:33:11AM +0200, Jerome Pouiller wrote: > > From: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx> > > > > The function hif_scan() return the timeout for the completion of the > > scan request. It is the only function from hif_tx.c that return another > > thing than just an error code. This behavior is not coherent with the > > rest of file. Worse, if value returned is positive, the caller can't > > make say if it is a timeout or the value returned by the hardware. > > > > Uniformize API with other HIF functions, only return the error code and > > pass timeout with parameters. > > > > Signed-off-by: Jérôme Pouiller <jerome.pouiller@xxxxxxxxxx> > > --- > > drivers/staging/wfx/hif_tx.c | 6 ++++-- > > drivers/staging/wfx/hif_tx.h | 2 +- > > drivers/staging/wfx/scan.c | 6 +++--- > > 3 files changed, 8 insertions(+), 6 deletions(-) > > This patch fails to apply to my branch, so I've stopped here in the > patch series. > > Can you rebase and resend the remaining ones? Ok, all others worked, just this one failed, so I've applied them. greg k-h
