* [PATCH 1/3] dio: Make dio_match_device() static
2020-01-12 16:56 [PATCH 0/3] dio: Miscellaneous cleanups Geert Uytterhoeven
@ 2020-01-12 16:56 ` Geert Uytterhoeven
2020-01-12 16:56 ` [PATCH 2/3] dio: Fix dio_bus_match() kerneldoc Geert Uytterhoeven
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2020-01-12 16:56 UTC (permalink / raw)
To: Philip Blundell; +Cc: linux-m68k, linux-kernel, Geert Uytterhoeven
Unlike its PCI counterpart, dio_match_device() was never used outside
the DIO bus code.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/dio/dio-driver.c | 3 +--
include/linux/dio.h | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c
index a7b174ef4c85f9c4..daf87e214a7794c2 100644
--- a/drivers/dio/dio-driver.c
+++ b/drivers/dio/dio-driver.c
@@ -25,7 +25,7 @@
* dio_device_id structure or %NULL if there is no match.
*/
-const struct dio_device_id *
+static const struct dio_device_id *
dio_match_device(const struct dio_device_id *ids,
const struct dio_dev *d)
{
@@ -137,7 +137,6 @@ static int __init dio_driver_init(void)
postcore_initcall(dio_driver_init);
-EXPORT_SYMBOL(dio_match_device);
EXPORT_SYMBOL(dio_register_driver);
EXPORT_SYMBOL(dio_unregister_driver);
EXPORT_SYMBOL(dio_bus_type);
diff --git a/include/linux/dio.h b/include/linux/dio.h
index 1470d1d943b477ab..ca07243690edf6eb 100644
--- a/include/linux/dio.h
+++ b/include/linux/dio.h
@@ -247,7 +247,6 @@ extern int dio_create_sysfs_dev_files(struct dio_dev *);
/* New-style probing */
extern int dio_register_driver(struct dio_driver *);
extern void dio_unregister_driver(struct dio_driver *);
-extern const struct dio_device_id *dio_match_device(const struct dio_device_id *ids, const struct dio_dev *z);
static inline struct dio_driver *dio_dev_driver(const struct dio_dev *d)
{
return d->driver;
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/3] dio: Fix dio_bus_match() kerneldoc
2020-01-12 16:56 [PATCH 0/3] dio: Miscellaneous cleanups Geert Uytterhoeven
2020-01-12 16:56 ` [PATCH 1/3] dio: Make dio_match_device() static Geert Uytterhoeven
@ 2020-01-12 16:56 ` Geert Uytterhoeven
2020-01-12 16:56 ` [PATCH 3/3] dio: Remove unused dio_dev_driver() Geert Uytterhoeven
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2020-01-12 16:56 UTC (permalink / raw)
To: Philip Blundell; +Cc: linux-m68k, linux-kernel, Geert Uytterhoeven
The kerneldoc for dio_bus_match() was obviously copied from
dio_match_device(), but wasnt't updated for the different calling
context and semantics.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
drivers/dio/dio-driver.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/dio/dio-driver.c b/drivers/dio/dio-driver.c
index daf87e214a7794c2..69c46935ffc78cef 100644
--- a/drivers/dio/dio-driver.c
+++ b/drivers/dio/dio-driver.c
@@ -105,9 +105,9 @@ void dio_unregister_driver(struct dio_driver *drv)
* @dev: the DIO device structure to match against
* @drv: the &device_driver that points to the array of DIO device id structures to search
*
- * Used by a driver to check whether a DIO device present in the
- * system is in its list of supported devices. Returns the matching
- * dio_device_id structure or %NULL if there is no match.
+ * Used by the driver core to check whether a DIO device present in the
+ * system is in a driver's list of supported devices. Returns 1 if supported,
+ * and 0 if there is no match.
*/
static int dio_bus_match(struct device *dev, struct device_driver *drv)
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 3/3] dio: Remove unused dio_dev_driver()
2020-01-12 16:56 [PATCH 0/3] dio: Miscellaneous cleanups Geert Uytterhoeven
2020-01-12 16:56 ` [PATCH 1/3] dio: Make dio_match_device() static Geert Uytterhoeven
2020-01-12 16:56 ` [PATCH 2/3] dio: Fix dio_bus_match() kerneldoc Geert Uytterhoeven
@ 2020-01-12 16:56 ` Geert Uytterhoeven
2020-01-13 7:43 ` [PATCH 0/3] dio: Miscellaneous cleanups Kars de Jong
2020-02-10 11:16 ` Geert Uytterhoeven
4 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2020-01-12 16:56 UTC (permalink / raw)
To: Philip Blundell; +Cc: linux-m68k, linux-kernel, Geert Uytterhoeven
This function was never used.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
include/linux/dio.h | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/linux/dio.h b/include/linux/dio.h
index ca07243690edf6eb..5abd07361eb516b5 100644
--- a/include/linux/dio.h
+++ b/include/linux/dio.h
@@ -247,10 +247,6 @@ extern int dio_create_sysfs_dev_files(struct dio_dev *);
/* New-style probing */
extern int dio_register_driver(struct dio_driver *);
extern void dio_unregister_driver(struct dio_driver *);
-static inline struct dio_driver *dio_dev_driver(const struct dio_dev *d)
-{
- return d->driver;
-}
#define dio_resource_start(d) ((d)->resource.start)
#define dio_resource_end(d) ((d)->resource.end)
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/3] dio: Miscellaneous cleanups
2020-01-12 16:56 [PATCH 0/3] dio: Miscellaneous cleanups Geert Uytterhoeven
` (2 preceding siblings ...)
2020-01-12 16:56 ` [PATCH 3/3] dio: Remove unused dio_dev_driver() Geert Uytterhoeven
@ 2020-01-13 7:43 ` Kars de Jong
2020-01-13 7:53 ` Geert Uytterhoeven
2020-02-10 11:16 ` Geert Uytterhoeven
4 siblings, 1 reply; 7+ messages in thread
From: Kars de Jong @ 2020-01-13 7:43 UTC (permalink / raw)
To: Geert Uytterhoeven; +Cc: Philip Blundell, linux-m68k, linux-kernel
Hi Geert!
Op zo 12 jan. 2020 om 17:56 schreef Geert Uytterhoeven <geert@linux-m68k.org>:
>
> Hi all,
>
> This patch series contains miscellaneous cleanups for the Zorro bus
Zorro -> DIO
> code.
>
> Geert Uytterhoeven (3):
> dio: Make dio_match_device() static
> dio: Fix dio_bus_match() kerneldoc
> dio: Remove unused dio_dev_driver()
>
> drivers/dio/dio-driver.c | 9 ++++-----
> include/linux/dio.h | 5 -----
> 2 files changed, 4 insertions(+), 10 deletions(-)
>
> --
> 2.17.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/3] dio: Miscellaneous cleanups
2020-01-13 7:43 ` [PATCH 0/3] dio: Miscellaneous cleanups Kars de Jong
@ 2020-01-13 7:53 ` Geert Uytterhoeven
0 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2020-01-13 7:53 UTC (permalink / raw)
To: Kars de Jong; +Cc: Philip Blundell, Linux/m68k, Linux Kernel Mailing List
Hi Kars,
On Mon, Jan 13, 2020 at 8:43 AM Kars de Jong <karsdejong@home.nl> wrote:
> Op zo 12 jan. 2020 om 17:56 schreef Geert Uytterhoeven <geert@linux-m68k.org>:
> > This patch series contains miscellaneous cleanups for the Zorro bus
>
> Zorro -> DIO
Thanks! Fortunately the issue is present in the cover letter only ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/3] dio: Miscellaneous cleanups
2020-01-12 16:56 [PATCH 0/3] dio: Miscellaneous cleanups Geert Uytterhoeven
` (3 preceding siblings ...)
2020-01-13 7:43 ` [PATCH 0/3] dio: Miscellaneous cleanups Kars de Jong
@ 2020-02-10 11:16 ` Geert Uytterhoeven
4 siblings, 0 replies; 7+ messages in thread
From: Geert Uytterhoeven @ 2020-02-10 11:16 UTC (permalink / raw)
To: Philip Blundell; +Cc: Linux/m68k, Linux Kernel Mailing List
On Sun, Jan 12, 2020 at 5:56 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> This patch series contains miscellaneous cleanups for the Zorro bus
> code.
>
> Geert Uytterhoeven (3):
> dio: Make dio_match_device() static
> dio: Fix dio_bus_match() kerneldoc
> dio: Remove unused dio_dev_driver()
Thanks, applied and queued for v5.7.
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
^ permalink raw reply [flat|nested] 7+ messages in thread