From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-spi@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Mark Brown <broonie@kernel.org>, Chris Healy <cphealy@gmail.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 11/12] spi: bitbang: Introduce spi_bitbang_init()
Date: Tue, 2 Apr 2019 21:01:32 -0700 [thread overview]
Message-ID: <20190403040133.1459-12-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190403040133.1459-1-andrew.smirnov@gmail.com>
Move all of the code doing struct spi_bitbang initialization, so that
it can be paired with devm_spi_register_master() in order to avoid
having to call spi_bitbang_stop() explicitly.
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
---
drivers/spi/spi-bitbang.c | 66 +++++++++++++++++++--------------
include/linux/spi/spi_bitbang.h | 1 +
2 files changed, 40 insertions(+), 27 deletions(-)
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index dd9a8c54a693..4243e53f9f7b 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -335,6 +335,42 @@ static void spi_bitbang_set_cs(struct spi_device *spi, bool enable)
/*----------------------------------------------------------------------*/
+int spi_bitbang_init(struct spi_bitbang *bitbang)
+{
+ struct spi_master *master = bitbang->master;
+
+ if (!master || !bitbang->chipselect)
+ return -EINVAL;
+
+ mutex_init(&bitbang->lock);
+
+ if (!master->mode_bits)
+ master->mode_bits = SPI_CPOL | SPI_CPHA | bitbang->flags;
+
+ if (master->transfer || master->transfer_one_message)
+ return -EINVAL;
+
+ master->prepare_transfer_hardware = spi_bitbang_prepare_hardware;
+ master->unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;
+ master->transfer_one = spi_bitbang_transfer_one;
+ master->set_cs = spi_bitbang_set_cs;
+
+ if (!bitbang->txrx_bufs) {
+ bitbang->use_dma = 0;
+ bitbang->txrx_bufs = spi_bitbang_bufs;
+ if (!master->setup) {
+ if (!bitbang->setup_transfer)
+ bitbang->setup_transfer =
+ spi_bitbang_setup_transfer;
+ master->setup = spi_bitbang_setup;
+ master->cleanup = spi_bitbang_cleanup;
+ }
+ }
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(spi_bitbang_init);
+
/**
* spi_bitbang_start - start up a polled/bitbanging SPI master driver
* @bitbang: driver handle
@@ -368,33 +404,9 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
struct spi_master *master = bitbang->master;
int ret;
- if (!master || !bitbang->chipselect)
- return -EINVAL;
-
- mutex_init(&bitbang->lock);
-
- if (!master->mode_bits)
- master->mode_bits = SPI_CPOL | SPI_CPHA | bitbang->flags;
-
- if (master->transfer || master->transfer_one_message)
- return -EINVAL;
-
- master->prepare_transfer_hardware = spi_bitbang_prepare_hardware;
- master->unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;
- master->transfer_one = spi_bitbang_transfer_one;
- master->set_cs = spi_bitbang_set_cs;
-
- if (!bitbang->txrx_bufs) {
- bitbang->use_dma = 0;
- bitbang->txrx_bufs = spi_bitbang_bufs;
- if (!master->setup) {
- if (!bitbang->setup_transfer)
- bitbang->setup_transfer =
- spi_bitbang_setup_transfer;
- master->setup = spi_bitbang_setup;
- master->cleanup = spi_bitbang_cleanup;
- }
- }
+ ret = spi_bitbang_init(bitbang);
+ if (ret)
+ return ret;
/* driver may get busy before register() returns, especially
* if someone registered boardinfo for devices
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index b7e021b274dc..4444c2a992cb 100644
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -44,6 +44,7 @@ extern int spi_bitbang_setup_transfer(struct spi_device *spi,
/* start or stop queue processing */
extern int spi_bitbang_start(struct spi_bitbang *spi);
+extern int spi_bitbang_init(struct spi_bitbang *spi);
extern void spi_bitbang_stop(struct spi_bitbang *spi);
#endif /* __SPI_BITBANG_H */
--
2.20.1
next prev parent reply other threads:[~2019-04-03 4:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 4:01 [PATCH 00/12] SPI GPIO improvements Andrey Smirnov
2019-04-03 4:01 ` [PATCH 01/12] spi: gpio: Drop unused spi_to_pdata() Andrey Smirnov
2019-04-03 4:42 ` Applied "spi: gpio: Drop unused spi_to_pdata()" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 02/12] spi: gpio: Add local struct device pointer in spi_gpio_probe() Andrey Smirnov
2019-04-03 4:42 ` Applied "spi: gpio: Add local struct device pointer in spi_gpio_probe()" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 03/12] spi: gpio: Add local struct spi_bitbang pointer in spi_gpio_probe() Andrey Smirnov
2019-04-03 4:42 ` Applied "spi: gpio: Add local struct spi_bitbang pointer in spi_gpio_probe()" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 04/12] spi: gpio: Simplify SPI_MASTER_NO_TX check in spi_gpio_probe() Andrey Smirnov
2019-04-03 4:42 ` Applied "spi: gpio: Simplify SPI_MASTER_NO_TX check in spi_gpio_probe()" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 05/12] spi: gpio: Drop unused pdata copy in struct spi_gpio Andrey Smirnov
2019-04-03 4:42 ` Applied "spi: gpio: Drop unused pdata copy in struct spi_gpio" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 06/12] spi: gpio: Don't request CS GPIO in DT use-case Andrey Smirnov
2019-04-05 3:26 ` Applied "spi: gpio: Don't request CS GPIO in DT use-case" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 07/12] spi: Don't call spi_get_gpio_descs() before device name is set Andrey Smirnov
2019-04-05 3:26 ` Applied "spi: Don't call spi_get_gpio_descs() before device name is set" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 08/12] spi: gpio: Drop mflags argument from spi_gpio_request() Andrey Smirnov
2019-04-05 3:26 ` Applied "spi: gpio: Drop mflags argument from spi_gpio_request()" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 09/12] spi: gpio: Drop unused pdev field in struct spi_gpio Andrey Smirnov
2019-04-05 3:26 ` Applied "spi: gpio: Drop unused pdev field in struct spi_gpio" to the spi tree Mark Brown
2019-04-03 4:01 ` [PATCH 10/12] spi: gpio: Make sure spi_master_put() is called in every error path Andrey Smirnov
2019-04-08 7:32 ` Applied "spi: gpio: Make sure spi_master_put() is called in every error path" to the spi tree Mark Brown
2019-04-03 4:01 ` Andrey Smirnov [this message]
2019-04-08 7:32 ` Applied "spi: bitbang: Introduce spi_bitbang_init()" " Mark Brown
2019-04-03 4:01 ` [PATCH 12/12] spi: gpio: Use devm_spi_register_master() Andrey Smirnov
2019-04-08 7:32 ` Applied "spi: gpio: Use devm_spi_register_master()" to the spi tree Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190403040133.1459-12-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=broonie@kernel.org \
--cc=cphealy@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).