2020-01-12 16:52:40

by Geert Uytterhoeven

Subject: [PATCH] MIPS: ip22-gio: Make gio_match_device() static

Unlike its PCI counterpart, gio_match_device() was never used outside
the GIO bus code.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
arch/mips/include/asm/gio_device.h | 2 --
arch/mips/sgi-ip22/ip22-gio.c | 6 +++---
2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/arch/mips/include/asm/gio_device.h b/arch/mips/include/asm/gio_device.h
index c52948f9ca9598af..159087f5386e9efd 100644
--- a/arch/mips/include/asm/gio_device.h
+++ b/arch/mips/include/asm/gio_device.h
@@ -32,8 +32,6 @@ struct gio_driver {
};
#define to_gio_driver(drv) container_of(drv, struct gio_driver, driver)

-extern const struct gio_device_id *gio_match_device(const struct gio_device_id *,
- const struct gio_device *);
extern struct gio_device *gio_dev_get(struct gio_device *);
extern void gio_dev_put(struct gio_device *);

diff --git a/arch/mips/sgi-ip22/ip22-gio.c b/arch/mips/sgi-ip22/ip22-gio.c
index 282b47c2dc2707b5..de0768a49ee87833 100644
--- a/arch/mips/sgi-ip22/ip22-gio.c
+++ b/arch/mips/sgi-ip22/ip22-gio.c
@@ -47,8 +47,9 @@ static struct device gio_bus = {
* Used by a driver to check whether an of_device present in the
* system is in its list of supported devices.
*/
-const struct gio_device_id *gio_match_device(const struct gio_device_id *match,
- const struct gio_device *dev)
+static const struct gio_device_id *
+gio_match_device(const struct gio_device_id *match,
+ const struct gio_device *dev)
{
const struct gio_device_id *ids;

@@ -58,7 +59,6 @@ const struct gio_device_id *gio_match_device(const struct gio_device_id *match,

return NULL;
}
-EXPORT_SYMBOL_GPL(gio_match_device);

struct gio_device *gio_dev_get(struct gio_device *dev)
{
--
2.17.1

2020-01-13 19:13:38

by Paul Burton

Subject: Re: [PATCH] MIPS: ip22-gio: Make gio_match_device() static

Hello,

Geert Uytterhoeven wrote:
> Unlike its PCI counterpart, gio_match_device() was never used outside
> the GIO bus code.

Applied to mips-next.

> commit 70eec920d4f2
> https://git.kernel.org/mips/c/70eec920d4f2
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
> Signed-off-by: Paul Burton <[email protected]>

Thanks,
Paul

[ This message was auto-generated; if you believe anything is incorrect
then please email [email protected] to report it. ]