git: b9db5e0a8f38 - main - sdio: Change the sdio helper name and arg order

The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/src/commit/?id=b9db5e0a8f38cfcfada7238a9895ad45f39f10a9

commit b9db5e0a8f38cfcfada7238a9895ad45f39f10a9
Author:     Emmanuel Vadot <manu@FreeBSD.org>
AuthorDate: 2021-05-21 09:56:39 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-08-10 20:07:23 +0000

    sdio: Change the sdio helper name and arg order
    
    Do not use b/l but _1/_4 also address comes first and then data.
    This makes them closer to something like bus_space_{read,write}
    We have no users in the tree.
---
 sys/dev/sdio/sdio_subr.c | 12 ++++++------
 sys/dev/sdio/sdio_subr.h | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/sys/dev/sdio/sdio_subr.c b/sys/dev/sdio/sdio_subr.c
index e2a6573abc6f..55f09a55a02b 100644
--- a/sys/dev/sdio/sdio_subr.c
+++ b/sys/dev/sdio/sdio_subr.c
@@ -139,7 +139,7 @@ sdio_set_block_size(struct sdio_func *f, uint16_t bs)
 }
 
 uint8_t
-sdio_readb(struct sdio_func *f, uint32_t addr, int *err)
+sdio_read_1(struct sdio_func *f, uint32_t addr, int *err)
 {
 	int error;
 	uint8_t v;
@@ -157,7 +157,7 @@ sdio_readb(struct sdio_func *f, uint32_t addr, int *err)
 }
 
 void
-sdio_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err)
+sdio_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err)
 {
 	int error;
 
@@ -167,7 +167,7 @@ sdio_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err)
 }
 
 uint32_t
-sdio_readl(struct sdio_func *f, uint32_t addr, int *err)
+sdio_read_4(struct sdio_func *f, uint32_t addr, int *err)
 {
 	int error;
 	uint32_t v;
@@ -186,7 +186,7 @@ sdio_readl(struct sdio_func *f, uint32_t addr, int *err)
 }
 
 void
-sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err)
+sdio_write_4(struct sdio_func *f, uint32_t addr, uint32_t val, int *err)
 {
 	int error;
 
@@ -197,7 +197,7 @@ sdio_writel(struct sdio_func *f, uint32_t val, uint32_t addr, int *err)
 }
 
 uint8_t
-sdio_f0_readb(struct sdio_func *f, uint32_t addr, int *err)
+sdio_f0_read_1(struct sdio_func *f, uint32_t addr, int *err)
 {
 	int error;
 	uint8_t v;
@@ -215,7 +215,7 @@ sdio_f0_readb(struct sdio_func *f, uint32_t addr, int *err)
 }
 
 void
-sdio_f0_writeb(struct sdio_func *f, uint8_t val, uint32_t addr, int *err)
+sdio_f0_write_1(struct sdio_func *f, uint32_t addr, uint8_t val, int *err)
 {
 	int error;
 
diff --git a/sys/dev/sdio/sdio_subr.h b/sys/dev/sdio/sdio_subr.h
index f16826298e13..43a5b10857cc 100644
--- a/sys/dev/sdio/sdio_subr.h
+++ b/sys/dev/sdio/sdio_subr.h
@@ -95,13 +95,13 @@ int sdio_enable_func(struct sdio_func *);
 int sdio_disable_func(struct sdio_func *);
 int sdio_set_block_size(struct sdio_func *, uint16_t);
 
-uint8_t sdio_readb(struct sdio_func *, uint32_t, int *);
-void sdio_writeb(struct sdio_func *, uint8_t, uint32_t, int *);
-uint32_t sdio_readl(struct sdio_func *, uint32_t, int *);
-void sdio_writel(struct sdio_func *, uint32_t, uint32_t, int *);
+uint8_t sdio_read_1(struct sdio_func *, uint32_t, int *);
+void sdio_write_1(struct sdio_func *, uint32_t, uint8_t, int *);
+uint32_t sdio_read_4(struct sdio_func *, uint32_t, int *);
+void sdio_write_4(struct sdio_func *, uint32_t, uint32_t, int *);
 
-uint8_t sdio_f0_readb(struct sdio_func *, uint32_t, int *);
-void sdio_f0_writeb(struct sdio_func *, uint8_t, uint32_t, int *);
+uint8_t sdio_f0_read_1(struct sdio_func *, uint32_t, int *);
+void sdio_f0_write_1(struct sdio_func *, uint32_t, uint8_t, int *);
 #endif /* _KERNEL */
 
 #endif /* _SDIO_SUBR_H_ */