[0/3] Fix some coding style issues

This series fixes some coding style issues. No functional change.

David Jander (3):
  spi: spi.c: White-space fix in __spi_pump_messages()
  spi: spi.c: Fix comment style
  spi: spi.c: Remove redundant else block

 drivers/spi/spi.c       | 106 ++++++++++++++++++++--------------------
 include/linux/spi/spi.h |  82 +++++++++++++++----------------
 2 files changed, 94 insertions(+), 94 deletions(-)

On Wed, 29 Jun 2022 16:25:19 +0200
David Jander <david@protonic.nl> wrote:

> Reported-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Signed-off-by: David Jander <david@protonic.nl>
> ---
>  drivers/spi/spi.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
> index 09d4959bc09c..dc1a324e3271 100644
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -1636,13 +1636,13 @@ static int __spi_pump_transfer_message(struct spi_controller *ctlr,
>  		dev_err(&ctlr->dev,
>  			"failed to transfer one message from queue\n");
>  		return ret;
> -	} else {
> -		WRITE_ONCE(ctlr->cur_msg_need_completion, true);
> -		smp_mb(); /* see spi_finalize_current_message()... */
> -		if (READ_ONCE(ctlr->cur_msg_incomplete))
> -			wait_for_completion(&ctlr->cur_msg_completion);
>  	}
>  
> +	WRITE_ONCE(ctlr->cur_msg_need_completion, true);
> +	smp_mb(); /* See spi_finalize_current_message()... */

Argh. Just noticed that this comment fix slipped into the wrong patch.
Do I need to re-submit, or is this acceptable?

> +	if (READ_ONCE(ctlr->cur_msg_incomplete))
> +		wait_for_completion(&ctlr->cur_msg_completion);
> +
>  	return 0;
>  }
>  

Best regards,

On Wed, Jun 29, 2022 at 04:28:57PM +0200, David Jander wrote:
> David Jander <david@protonic.nl> wrote:

> > +	WRITE_ONCE(ctlr->cur_msg_need_completion, true);
> > +	smp_mb(); /* See spi_finalize_current_message()... */

> Argh. Just noticed that this comment fix slipped into the wrong patch.
> Do I need to re-submit, or is this acceptable?

It's fine, leave it unless you need to resend for some other reason.

On Wed, 29 Jun 2022 16:25:16 +0200, David Jander wrote:
> This series fixes some coding style issues. No functional change.
> 
> David Jander (3):
>   spi: spi.c: White-space fix in __spi_pump_messages()
>   spi: spi.c: Fix comment style
>   spi: spi.c: Remove redundant else block
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next

Thanks!

[1/3] spi: spi.c: White-space fix in __spi_pump_messages()
      commit: c191543e99fc03a36ccf7869392957a7182e0ada
[2/3] spi: spi.c: Fix comment style
      commit: 95c8222f0e52b09b7607616274e7cae84d519a9b
[3/3] spi: spi.c: Remove redundant else block
      commit: 31d4c1bdf157421b26d51f61a4da95dd20d171e2

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark