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

[Hans J. Koch]

On Fri, Dec 12, 2008 at 04:30:41PM +1100, Stephen Rothwell wrote:
> These are only ever assigned constant strings and never modified.

Hi Stephen,
that's correct, thanks for pointing this out.

@Greg: Stephen's patch will only apply with some fuzz since you've
accepted my portio patches in your queue. Below there's a version
that should apply cleanly.

> 
> This was noticed because Wolfram Sang needed to cast the result of
> of_get_property() in order to assign it to the name field of a struct
> uio_info.
> 
> Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>

Signed-off-by: Hans J. Koch <hjk@xxxxxxxxxxxxx>

> ---
>  Documentation/DocBook/uio-howto.tmpl |    4 ++--
>  include/linux/uio_driver.h           |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> 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();
>  
>  <itemizedlist>
>  <listitem><para>
> -<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.
>  </para></listitem>
>  
>  <listitem><para>
> -<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>.
>  </para></listitem>
>  
> 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

--------->8-----begin rebased version------------------------------------

These are only ever assigned constant strings and never modified.

This was noticed because Wolfram Sang needed to cast the result of
of_get_property() in order to assign it to the name field of a struct
uio_info.

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Signed-off-by: Hans J. Koch <hjk@xxxxxxxxxxxxx>
---
 Documentation/DocBook/uio-howto.tmpl |    4 ++--
 include/linux/uio_driver.h           |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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.

Index: linux-2.6.28-rc/Documentation/DocBook/uio-howto.tmpl
===================================================================
--- linux-2.6.28-rc.orig/Documentation/DocBook/uio-howto.tmpl	2008-12-06 02:08:16.000000000 +0100
+++ linux-2.6.28-rc/Documentation/DocBook/uio-howto.tmpl	2008-12-12 11:28:37.000000000 +0100
@@ -393,12 +393,12 @@
 
 <itemizedlist>
 <listitem><para>
-<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.
 </para></listitem>
 
 <listitem><para>
-<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>.
 </para></listitem>
 
Index: linux-2.6.28-rc/include/linux/uio_driver.h
===================================================================
--- linux-2.6.28-rc.orig/include/linux/uio_driver.h	2008-12-06 02:07:21.000000000 +0100
+++ linux-2.6.28-rc/include/linux/uio_driver.h	2008-12-12 11:28:37.000000000 +0100
@@ -76,8 +76,8 @@
  */
 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];
 	struct uio_port		port[MAX_UIO_PORT_REGIONS];
 	long			irq;


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/