From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
linux-spi@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v1 1/3] spi: bitbang: Use typedef for txrx_*() callbacks
Date: Fri, 17 May 2024 22:40:20 +0300 [thread overview]
Message-ID: <20240517194104.747328-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20240517194104.747328-1-andriy.shevchenko@linux.intel.com>
With a typedef for the txrx_*() callbacks the code looks neater.
Note that typedef for a function is okay to have.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/spi/spi-bitbang.c | 31 +++++++++----------------------
include/linux/spi/spi_bitbang.h | 7 ++++---
2 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/drivers/spi/spi-bitbang.c b/drivers/spi/spi-bitbang.c
index ca5cc67555c5..d88110acdc5f 100644
--- a/drivers/spi/spi-bitbang.c
+++ b/drivers/spi/spi-bitbang.c
@@ -38,26 +38,19 @@
* working quickly, or testing for differences that aren't speed related.
*/
+typedef unsigned int (*spi_bb_txrx_bufs_fn)(struct spi_device *, spi_bb_txrx_word_fn,
+ unsigned int, struct spi_transfer *,
+ unsigned int);
+
struct spi_bitbang_cs {
unsigned nsecs; /* (clock cycle time)/2 */
- u32 (*txrx_word)(struct spi_device *spi, unsigned nsecs,
- u32 word, u8 bits, unsigned flags);
- unsigned (*txrx_bufs)(struct spi_device *,
- u32 (*txrx_word)(
- struct spi_device *spi,
- unsigned nsecs,
- u32 word, u8 bits,
- unsigned flags),
- unsigned, struct spi_transfer *,
- unsigned);
+ spi_bb_txrx_word_fn txrx_word;
+ spi_bb_txrx_bufs_fn txrx_bufs;
};
static unsigned bitbang_txrx_8(
struct spi_device *spi,
- u32 (*txrx_word)(struct spi_device *spi,
- unsigned nsecs,
- u32 word, u8 bits,
- unsigned flags),
+ spi_bb_txrx_word_fn txrx_word,
unsigned ns,
struct spi_transfer *t,
unsigned flags
@@ -83,10 +76,7 @@ static unsigned bitbang_txrx_8(
static unsigned bitbang_txrx_16(
struct spi_device *spi,
- u32 (*txrx_word)(struct spi_device *spi,
- unsigned nsecs,
- u32 word, u8 bits,
- unsigned flags),
+ spi_bb_txrx_word_fn txrx_word,
unsigned ns,
struct spi_transfer *t,
unsigned flags
@@ -112,10 +102,7 @@ static unsigned bitbang_txrx_16(
static unsigned bitbang_txrx_32(
struct spi_device *spi,
- u32 (*txrx_word)(struct spi_device *spi,
- unsigned nsecs,
- u32 word, u8 bits,
- unsigned flags),
+ spi_bb_txrx_word_fn txrx_word,
unsigned ns,
struct spi_transfer *t,
unsigned flags
diff --git a/include/linux/spi/spi_bitbang.h b/include/linux/spi/spi_bitbang.h
index b930eca2ef7b..7ca08b430ed5 100644
--- a/include/linux/spi/spi_bitbang.h
+++ b/include/linux/spi/spi_bitbang.h
@@ -4,6 +4,8 @@
#include <linux/workqueue.h>
+typedef u32 (*spi_bb_txrx_word_fn)(struct spi_device *, unsigned int, u32, u8, unsigned int);
+
struct spi_bitbang {
struct mutex lock;
u8 busy;
@@ -28,9 +30,8 @@ struct spi_bitbang {
int (*txrx_bufs)(struct spi_device *spi, struct spi_transfer *t);
/* txrx_word[SPI_MODE_*]() just looks like a shift register */
- u32 (*txrx_word[4])(struct spi_device *spi,
- unsigned nsecs,
- u32 word, u8 bits, unsigned flags);
+ spi_bb_txrx_word_fn txrx_word[4];
+
int (*set_line_direction)(struct spi_device *spi, bool output);
};
--
2.43.0.rc1.1336.g36b5255a03ac
next prev parent reply other threads:[~2024-05-17 19:41 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-17 19:40 [PATCH v1 0/3] spi: bitbang: Clean up the driver Andy Shevchenko
2024-05-17 19:40 ` Andy Shevchenko [this message]
2024-05-17 19:40 ` [PATCH v1 2/3] spi: bitbang: Convert unsigned to unsigned int Andy Shevchenko
2024-05-17 19:40 ` [PATCH v1 3/3] spi: bitbang: Replace hard coded number of SPI modes Andy Shevchenko
2024-06-05 21:07 ` [PATCH v1 0/3] spi: bitbang: Clean up the driver Andy Shevchenko
2024-06-05 21:21 ` Mark Brown
2024-06-06 10:47 ` Andy Shevchenko
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=20240517194104.747328-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--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).