diff mbox

[2/9] media/radio: fix aimslab CONFIG IO PORT

Message ID 20110710125356.b6cb17c2.rdunlap@xenotime.net (mailing list archive)
State Rejected
Headers show

Commit Message

Randy Dunlap July 10, 2011, 7:53 p.m. UTC
From: Randy Dunlap <rdunlap@xenotime.net>

Modify radio-aimslab to use HEX_STRING(CONFIG_RADIO_RTRACK_PORT)
so that the correct IO port value is used.

Fixes this error message when CONFIG_RADIO_RTRACK_PORT=20f:
drivers/media/radio/radio-aimslab.c:49:17: error: invalid suffix "f" on integer constant

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/media/radio/radio-aimslab.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Arnaud Lacombe July 15, 2011, 1:44 a.m. UTC | #1
Hi,

2 to 7 will be not needed. I screwed up a autoconf.h generation while
refactoring the code. This is being addressed in the kbuild tree by:

https://patchwork.kernel.org/patch/975652/

My bad,
 - Arnaud

On Sun, Jul 10, 2011 at 3:53 PM, Randy Dunlap <rdunlap@xenotime.net> wrote:
> From: Randy Dunlap <rdunlap@xenotime.net>
>
> Modify radio-aimslab to use HEX_STRING(CONFIG_RADIO_RTRACK_PORT)
> so that the correct IO port value is used.
>
> Fixes this error message when CONFIG_RADIO_RTRACK_PORT=20f:
> drivers/media/radio/radio-aimslab.c:49:17: error: invalid suffix "f" on integer constant
>
> Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
> ---
>  drivers/media/radio/radio-aimslab.c |    7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> --- linux-next-20110707.orig/drivers/media/radio/radio-aimslab.c
> +++ linux-next-20110707/drivers/media/radio/radio-aimslab.c
> @@ -32,6 +32,7 @@
>  #include <linux/init.h>                /* Initdata                     */
>  #include <linux/ioport.h>      /* request_region               */
>  #include <linux/delay.h>       /* msleep                       */
> +#include <linux/stringify.h>
>  #include <linux/videodev2.h>   /* kernel radio structs         */
>  #include <linux/io.h>          /* outb, outb_p                 */
>  #include <media/v4l2-device.h>
> @@ -43,10 +44,12 @@ MODULE_LICENSE("GPL");
>  MODULE_VERSION("0.0.3");
>
>  #ifndef CONFIG_RADIO_RTRACK_PORT
> -#define CONFIG_RADIO_RTRACK_PORT -1
> +#define __RADIO_RTRACK_PORT -1
> +#else
> +#define __RADIO_RTRACK_PORT HEX_STRING(CONFIG_RADIO_RTRACK_PORT)
>  #endif
>
> -static int io = CONFIG_RADIO_RTRACK_PORT;
> +static int io = __RADIO_RTRACK_PORT;
>  static int radio_nr = -1;
>
>  module_param(io, int, 0);
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
>
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

--- linux-next-20110707.orig/drivers/media/radio/radio-aimslab.c
+++ linux-next-20110707/drivers/media/radio/radio-aimslab.c
@@ -32,6 +32,7 @@ 
 #include <linux/init.h>		/* Initdata			*/
 #include <linux/ioport.h>	/* request_region		*/
 #include <linux/delay.h>	/* msleep			*/
+#include <linux/stringify.h>
 #include <linux/videodev2.h>	/* kernel radio structs		*/
 #include <linux/io.h>		/* outb, outb_p			*/
 #include <media/v4l2-device.h>
@@ -43,10 +44,12 @@  MODULE_LICENSE("GPL");
 MODULE_VERSION("0.0.3");
 
 #ifndef CONFIG_RADIO_RTRACK_PORT
-#define CONFIG_RADIO_RTRACK_PORT -1
+#define __RADIO_RTRACK_PORT -1
+#else
+#define __RADIO_RTRACK_PORT HEX_STRING(CONFIG_RADIO_RTRACK_PORT)
 #endif
 
-static int io = CONFIG_RADIO_RTRACK_PORT;
+static int io = __RADIO_RTRACK_PORT;
 static int radio_nr = -1;
 
 module_param(io, int, 0);