Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b8ac9fc0e8cda9f9776019c5b0464b0c6d2d4c90

Authored by Stephen Rothwell
Committed by Greg Kroah-Hartman
1 parent a2ab3d3000
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

uio: make uio_info's name and version const 

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@canb.auug.org.au>
Signed-off-by: Hans J. Koch <hjk@linutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 4 additions and 4 deletions Side-by-side Diff

Documentation/DocBook/uio-howto.tmpl
Diff comments   View file @ b8ac9fc
... ... @@ -393,12 +393,12 @@
393 393  
394 394 <itemizedlist>
395 395 <listitem><para>
396   -<varname>char *name</varname>: Required. The name of your driver as
  396 +<varname>const char *name</varname>: Required. The name of your driver as
397 397 it will appear in sysfs. I recommend using the name of your module for this.
398 398 </para></listitem>
399 399  
400 400 <listitem><para>
401   -<varname>char *version</varname>: Required. This string appears in
  401 +<varname>const char *version</varname>: Required. This string appears in
402 402 <filename>/sys/class/uio/uioX/version</filename>.
403 403 </para></listitem>
404 404  
include/linux/uio_driver.h
Diff comments   View file @ b8ac9fc
... ... @@ -76,8 +76,8 @@
76 76 */
77 77 struct uio_info {
78 78 struct uio_device *uio_dev;
79   - char *name;
80   - char *version;
  79 + const char *name;
  80 + const char *version;
81 81 struct uio_mem mem[MAX_UIO_MAPS];
82 82 struct uio_port port[MAX_UIO_PORT_REGIONS];
83 83 long irq;