[PATCH] uio: make uio_info's name and version const

Stephen Rothwell
2008-12-12T05:30:55Z

Tested by compiling all the uio drivers available on x86. The others
(all in arch sh) only ever assign constant string literals to these
fields.

[Resent with properly quoted recipient addresses]

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index df87d1b..21ba47e 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -339,12 +339,12 @@ offset = N * getpagesize();



-<varname>char *name</varname>: Required. The name of your driver as
+<varname>const char *name</varname>: Required. The name of your driver as
it will appear in sysfs. I recommend using the name of your module for this.



-<varname>char *version</varname>: Required. This string appears in
+<varname>const char *version</varname>: Required. This string appears in
<filename>/sys/class/uio/uioX/version</filename>.


diff --git a/include/linux/uio_driver.h b/include/linux/uio_driver.h
index cdf338d..b5f23b1 100644
--- a/include/linux/uio_driver.h
+++ b/include/linux/uio_driver.h
@@ -57,8 +57,8 @@ struct uio_device;
*/
struct uio_info {
struct uio_device *uio_dev;
- char *name;
- char *version;
+ const char *name;
+ const char *version;
struct uio_mem mem[MAX_UIO_MAPS];
long irq;
unsigned long irq_flags;
--
1.6.0.5

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