lkml.org 
[lkml]   [2019]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    SubjectApplied "spi: gpio: Simplify SPI_MASTER_NO_TX check in spi_gpio_probe()" to the spi tree
    Date
    The patch

    spi: gpio: Simplify SPI_MASTER_NO_TX check in spi_gpio_probe()

    has been applied to the spi tree at

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

    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

    From 68cd9dc2cc00b2ab0dbcdbbec446d5bdc56fea4b Mon Sep 17 00:00:00 2001
    From: Andrey Smirnov <andrew.smirnov@gmail.com>
    Date: Tue, 2 Apr 2019 21:01:25 -0700
    Subject: [PATCH] spi: gpio: Simplify SPI_MASTER_NO_TX check in
    spi_gpio_probe()

    Swap branches of the if statement in order to simplify it's logical
    condition being checked. No functional change intended.

    Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
    Cc: Mark Brown <broonie@kernel.org>
    Cc: Chris Healy <cphealy@gmail.com>
    Cc: linux-spi@vger.kernel.org
    Cc: linux-kernel@vger.kernel.org
    Signed-off-by: Mark Brown <broonie@kernel.org>
    ---
    drivers/spi/spi-gpio.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c
    index ca97b861c625..137f47e271dc 100644
    --- a/drivers/spi/spi-gpio.c
    +++ b/drivers/spi/spi-gpio.c
    @@ -440,16 +440,16 @@ static int spi_gpio_probe(struct platform_device *pdev)
    bb->chipselect = spi_gpio_chipselect;
    bb->set_line_direction = spi_gpio_set_direction;

    - if ((master_flags & SPI_MASTER_NO_TX) == 0) {
    - bb->txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;
    - bb->txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;
    - bb->txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;
    - bb->txrx_word[SPI_MODE_3] = spi_gpio_txrx_word_mode3;
    - } else {
    + if (master_flags & SPI_MASTER_NO_TX) {
    bb->txrx_word[SPI_MODE_0] = spi_gpio_spec_txrx_word_mode0;
    bb->txrx_word[SPI_MODE_1] = spi_gpio_spec_txrx_word_mode1;
    bb->txrx_word[SPI_MODE_2] = spi_gpio_spec_txrx_word_mode2;
    bb->txrx_word[SPI_MODE_3] = spi_gpio_spec_txrx_word_mode3;
    + } else {
    + bb->txrx_word[SPI_MODE_0] = spi_gpio_txrx_word_mode0;
    + bb->txrx_word[SPI_MODE_1] = spi_gpio_txrx_word_mode1;
    + bb->txrx_word[SPI_MODE_2] = spi_gpio_txrx_word_mode2;
    + bb->txrx_word[SPI_MODE_3] = spi_gpio_txrx_word_mode3;
    }
    bb->setup_transfer = spi_bitbang_setup_transfer;

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-04-03 06:44    [W:4.118 / U:0.280 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site