linux-next: build failure after merge of the driver-core tree

Stephen Rothwell
2014-12-01T07:49:45Z

[-- Attachment #1: Type: text/plain, Size: 1461 bytes --]

Hi Greg,

After merging the driver-core tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

fs/debugfs/file.c:797:16: error: conflicting types for 'debugfs_create_devm_seqfile'
struct dentry *debugfs_create_devm_seqfile(struct device *dev, const char *name,
^
In file included from fs/debugfs/file.c:21:0:
include/linux/debugfs.h:102:16: note: previous declaration of 'debugfs_create_devm_seqfile' was here
struct dentry *debugfs_create_devm_seqfile(struct device *dev, const char *name,
^

Caused by commit 98210b7f73f1 ("debugfs: add helper function to create
device related seq_file") but I am not sure how ... it seems to be
related to the warning I reported earlier as the following patch fixes
it (and the warnings).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 1 Dec 2014 18:42:52 +1100
Subject: [PATCH] debugfs: predeclare struct device

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
include/linux/debugfs.h | 1 +
1 file changed, 1 insertion(+)

diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h
index d145287c0e44..37b17d95d648 100644
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
@@ -21,6 +21,7 @@
#include <linux/types.h>

struct file_operations;
+struct device;

struct debugfs_blob_wrapper {
void *data;
--
2.1.3

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]