From: Arnd Bergmann <[email protected]>
dev_dax_probe declaration for this function was removed with the only
caller outside of device.c. Mark it static to avoid a W=1
warning:
drivers/dax/device.c:399:5: error: no previous prototype for 'dev_dax_probe'
Similarly, run_dax() causes a warning, but this one is because the
declaration needs to be included:
drivers/dax/super.c:337:6: error: no previous prototype for 'run_dax'
Fixes: 83762cb5c7c4 ("dax: Kill DEV_DAX_PMEM_COMPAT")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/dax/device.c | 3 +--
drivers/dax/super.c | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/dax/device.c b/drivers/dax/device.c
index af9930c03c9c..30665a3ff6ea 100644
--- a/drivers/dax/device.c
+++ b/drivers/dax/device.c
@@ -396,7 +396,7 @@ static void dev_dax_kill(void *dev_dax)
kill_dev_dax(dev_dax);
}
-int dev_dax_probe(struct dev_dax *dev_dax)
+static int dev_dax_probe(struct dev_dax *dev_dax)
{
struct dax_device *dax_dev = dev_dax->dax_dev;
struct device *dev = &dev_dax->dev;
@@ -471,7 +471,6 @@ int dev_dax_probe(struct dev_dax *dev_dax)
run_dax(dax_dev);
return devm_add_action_or_reset(dev, dev_dax_kill, dev_dax);
}
-EXPORT_SYMBOL_GPL(dev_dax_probe);
static struct dax_device_driver device_dax_driver = {
.probe = dev_dax_probe,
diff --git a/drivers/dax/super.c b/drivers/dax/super.c
index c4c4728a36e4..8c05dae19bfe 100644
--- a/drivers/dax/super.c
+++ b/drivers/dax/super.c
@@ -14,6 +14,7 @@
#include <linux/dax.h>
#include <linux/fs.h>
#include "dax-private.h"
+#include "bus.h"
/**
* struct dax_device - anchor object for dax services
--
2.39.2
Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> dev_dax_probe declaration for this function was removed with the only
> caller outside of device.c. Mark it static to avoid a W=1
> warning:
> drivers/dax/device.c:399:5: error: no previous prototype for 'dev_dax_probe'
>
> Similarly, run_dax() causes a warning, but this one is because the
> declaration needs to be included:
>
> drivers/dax/super.c:337:6: error: no previous prototype for 'run_dax'
>
> Fixes: 83762cb5c7c4 ("dax: Kill DEV_DAX_PMEM_COMPAT")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> drivers/dax/device.c | 3 +--
> drivers/dax/super.c | 1 +
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dax/device.c b/drivers/dax/device.c
> index af9930c03c9c..30665a3ff6ea 100644
> --- a/drivers/dax/device.c
> +++ b/drivers/dax/device.c
> @@ -396,7 +396,7 @@ static void dev_dax_kill(void *dev_dax)
> kill_dev_dax(dev_dax);
> }
>
> -int dev_dax_probe(struct dev_dax *dev_dax)
> +static int dev_dax_probe(struct dev_dax *dev_dax)
> {
> struct dax_device *dax_dev = dev_dax->dax_dev;
> struct device *dev = &dev_dax->dev;
> @@ -471,7 +471,6 @@ int dev_dax_probe(struct dev_dax *dev_dax)
> run_dax(dax_dev);
> return devm_add_action_or_reset(dev, dev_dax_kill, dev_dax);
> }
> -EXPORT_SYMBOL_GPL(dev_dax_probe);
>
> static struct dax_device_driver device_dax_driver = {
> .probe = dev_dax_probe,
This hunk looks good.
> diff --git a/drivers/dax/super.c b/drivers/dax/super.c
> index c4c4728a36e4..8c05dae19bfe 100644
> --- a/drivers/dax/super.c
> +++ b/drivers/dax/super.c
> @@ -14,6 +14,7 @@
> #include <linux/dax.h>
> #include <linux/fs.h>
> #include "dax-private.h"
> +#include "bus.h"
This one came up before, and IIRC last time I said lets just move the run_dax()
prototype to dax-private.h.
https://lore.kernel.org/all/YiqF1a9VNiSWI5j0@iweiny-desk3
I can fix that up when applying.