[4/9] media/radio: fix gemtek CONFIG IO PORT

Message ID 20110710125545.8f010dd7.rdunlap@xenotime.net (mailing list archive)
State Superseded, archived
Headers

Commit Message

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

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

Fixes this error message when CONFIG_RADIO_GEMTEK_PORT=34c:
drivers/media/radio/radio-gemtek.c:49:18: error: invalid suffix "c" on integer constant

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
---
 drivers/media/radio/radio-gemtek.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
  

Patch

--- linux-next-20110707.orig/drivers/media/radio/radio-gemtek.c
+++ linux-next-20110707/drivers/media/radio/radio-gemtek.c
@@ -20,6 +20,7 @@ 
 #include <linux/init.h>		/* Initdata			*/
 #include <linux/ioport.h>	/* request_region		*/
 #include <linux/delay.h>	/* udelay			*/
+#include <linux/stringify.h>
 #include <linux/videodev2.h>	/* kernel radio structs		*/
 #include <linux/mutex.h>
 #include <linux/io.h>		/* outb, outb_p			*/
@@ -40,13 +41,15 @@  MODULE_VERSION("0.0.4");
  */
 
 #ifndef CONFIG_RADIO_GEMTEK_PORT
-#define CONFIG_RADIO_GEMTEK_PORT -1
+#define __RADIO_GEMTEK_PORT -1
+#else
+#define __RADIO_GEMTEK_PORT HEX_STRING(CONFIG_RADIO_GEMTEK_PORT)
 #endif
 #ifndef CONFIG_RADIO_GEMTEK_PROBE
 #define CONFIG_RADIO_GEMTEK_PROBE 1
 #endif
 
-static int io		= CONFIG_RADIO_GEMTEK_PORT;
+static int io		= __RADIO_GEMTEK_PORT;
 static int probe	= CONFIG_RADIO_GEMTEK_PROBE;
 static int hardmute;
 static int shutdown	= 1;