Skip to contentSkip to conversation

dio: Miscellaneous cleanups

PATCH Applied Geert Uytterhoeven 2 participants 7 messages Jan 12, 2020 – Feb 10, 2020

lore
Share & tools
lore
#0 lore raw

cover dio: Miscellaneous cleanups

Hi all,

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()

 drivers/dio/dio-driver.c | 9 ++++-----
 include/linux/dio.h      | 5 -----
 2 files changed, 4 insertions(+), 10 deletions(-)
Signature · 12 lines
2.17.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
#1 lore raw

PATCH 1/3 dio: Make dio_match_device() static

Unlike its PCI counterpart, dio_match_device() was never used outside the DIO bus code.

---
 drivers/dio/dio-driver.c | 3 +--
 include/linux/dio.h      | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/dio/dio-driver.c +1 -2
index a7b174ef4c85f9c4..daf87e214a7794c2 100644
@@ -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);
include/linux/dio.h +0 -1
index 1470d1d943b477ab..ca07243690edf6eb 100644
@@ -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;
Signature · 1 line
2.17.1
#2 lore raw

PATCH 2/3 dio: Fix dio_bus_match() kerneldoc

In reply to 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.

---
 drivers/dio/dio-driver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/dio/dio-driver.c +3 -3
index daf87e214a7794c2..69c46935ffc78cef 100644
@@ -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)
Signature · 1 line
2.17.1
#3 lore raw

PATCH 3/3 dio: Remove unused dio_dev_driver()

In reply to Geert Uytterhoeven

This function was never used.

---
 include/linux/dio.h | 4 ----
 1 file changed, 4 deletions(-)
include/linux/dio.h +0 -4
index ca07243690edf6eb..5abd07361eb516b5 100644
@@ -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)
Signature · 1 line
2.17.1
#4 lore raw
In reply to Geert Uytterhoeven

Hi Geert!

Op zo 12 jan. 2020 om 17:56 schreef Geert Uytterhoeven <[email protected]>:

Quoted 4 lines

Hi all,

This patch series contains miscellaneous cleanups for the Zorro bus

Zorro -> DIO

Quoted 13 lines

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

#5 lore raw

Hi Kars,

Quoted 4 lines · Kars de Jong

Op zo 12 jan. 2020 om 17:56 schreef Geert Uytterhoeven <[email protected]>:

Quoted 1 line

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

Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

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
author Applied
#6 lore raw
In reply to Geert Uytterhoeven
Quoted 7 lines · Geert Uytterhoeven

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 -- [email protected]

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