isa: Dummy isa_register_driver should return error code

William Breathitt Gray · gregkh · commit 5e25db870ec9 · 2016-06-17T20:47:11.000-07:00
The inline isa_register_driver stub simply allows compilation on systems
with CONFIG_ISA disabled; the dummy isa_register_driver does not
register an isa_driver at all. The inline isa_register_driver should
return -ENODEV to indicate lack of support when attempting to register
an isa_driver on such a system with CONFIG_ISA disabled.

Cc: Matthew Wilcox &lt;matthew@wil.cx&gt;
Reported-by: Sasha Levin &lt;sasha.levin@oracle.com&gt;
Tested-by: Ye Xiaolong
Signed-off-by: William Breathitt Gray &lt;vilhelm.gray@gmail.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/include/linux/isa.h b/include/linux/isa.h
@@ -6,6 +6,7 @@
 #define __LINUX_ISA_H
 
 #include <linux/device.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 
 struct isa_driver {
@@ -28,7 +29,7 @@ void isa_unregister_driver(struct isa_driver *);
 #else
 static inline int isa_register_driver(struct isa_driver *d, unsigned int i)
 {
-	return 0;
+	return -ENODEV;
 }
 
 static inline void isa_unregister_driver(struct isa_driver *d)

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`	`#define __LINUX_ISA_H`
`7`	`7`
`8`	`8`	`#include <linux/device.h>`
	`9`	`+#include <linux/errno.h>`
`9`	`10`	`#include <linux/kernel.h>`
`10`	`11`
`11`	`12`	`struct isa_driver {`
`@@ -28,7 +29,7 @@ void isa_unregister_driver(struct isa_driver *);`
`28`	`29`	`#else`
`29`	`30`	`static inline int isa_register_driver(struct isa_driver *d, unsigned int i)`
`30`	`31`	`{`
`31`		`- return 0;`
	`32`	`+ return -ENODEV;`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`static inline void isa_unregister_driver(struct isa_driver *d)`