1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 29201438b45f..3a4fd8514511 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -602,7 +602,7 @@ struct em28xx_board em28xx_boards[] = {
                 .name         = "Gadmei UTV330+",
                 .tuner_type   = TUNER_TNF_5335MF,
                 .tda9887_conf = TDA9887_PRESENT,
-                .ir_codes     = &IR_KEYTABLE(gadmei_rm008z),
+                .ir_codes     = RC_MAP_GADMEI_RM008Z,
                 .decoder      = EM28XX_SAA711X,
                 .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .input        = { {
@@ -791,7 +791,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .has_dvb      = 1,
                 .dvb_gpio     = hauppauge_wintv_hvr_900_digital,
-                .ir_codes     = &IR_KEYTABLE(hauppauge_new),
+                .ir_codes     = RC_MAP_HAUPPAUGE_NEW,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -816,7 +816,7 @@ struct em28xx_board em28xx_boards[] = {
                 .tuner_type   = TUNER_XC2028,
                 .tuner_gpio   = default_tuner_gpio,
                 .mts_firmware = 1,
-                .ir_codes     = &IR_KEYTABLE(hauppauge_new),
+                .ir_codes     = RC_MAP_HAUPPAUGE_NEW,
                 .decoder      = EM28XX_TVP5150,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -842,7 +842,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &IR_KEYTABLE(hauppauge_new),
+                .ir_codes       = RC_MAP_HAUPPAUGE_NEW,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -868,7 +868,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &IR_KEYTABLE(rc5_hauppauge_new),
+                .ir_codes       = RC_MAP_RC5_HAUPPAUGE_NEW,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -894,7 +894,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &IR_KEYTABLE(pinnacle_pctv_hd),
+                .ir_codes       = RC_MAP_PINNACLE_PCTV_HD,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -920,7 +920,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware   = 1,
                 .has_dvb        = 1,
                 .dvb_gpio       = hauppauge_wintv_hvr_900_digital,
-                .ir_codes       = &IR_KEYTABLE(ati_tv_wonder_hd_600),
+                .ir_codes       = RC_MAP_ATI_TV_WONDER_HD_600,
                 .decoder        = EM28XX_TVP5150,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -946,7 +946,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder        = EM28XX_TVP5150,
                 .has_dvb        = 1,
                 .dvb_gpio       = default_digital,
-                .ir_codes       = &IR_KEYTABLE(terratec_cinergy_xs),
+                .ir_codes       = RC_MAP_TERRATEC_CINERGY_XS,
                 .xclk           = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1296,7 +1296,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder        = EM28XX_SAA711X,
                 .has_dvb        = 1,
                 .dvb_gpio       = em2882_kworld_315u_digital,
-                .ir_codes       = &IR_KEYTABLE(kworld_315u),
+                .ir_codes       = RC_MAP_KWORLD_315U,
                 .xclk           = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .i2c_speed      = EM28XX_I2C_CLK_WAIT_ENABLE,
                 /* Analog mode - still not ready */
@@ -1425,7 +1425,7 @@ struct em28xx_board em28xx_boards[] = {
                 .has_dvb      = 1,
                 .dvb_gpio     = kworld_330u_digital,
                 .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ, /* NEC IR */
-                .ir_codes     = &IR_KEYTABLE(kworld_315u),
+                .ir_codes     = RC_MAP_KWORLD_315U,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -1448,7 +1448,7 @@ struct em28xx_board em28xx_boards[] = {
                 .decoder      = EM28XX_TVP5150,
                 .has_dvb      = 1,
                 .dvb_gpio     = hauppauge_wintv_hvr_900_digital,
-                .ir_codes     = &IR_KEYTABLE(terratec_cinergy_xs),
+                .ir_codes     = RC_MAP_TERRATEC_CINERGY_XS,
                 .xclk         = EM28XX_XCLK_FREQUENCY_12MHZ,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
@@ -1541,7 +1541,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .decoder      = EM28XX_TVP5150,
                 .tuner_gpio   = default_tuner_gpio,
-                .ir_codes     = &IR_KEYTABLE(kaiomy),
+                .ir_codes     = RC_MAP_KAIOMY,
                 .input          = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -1641,7 +1641,7 @@ struct em28xx_board em28xx_boards[] = {
                 .mts_firmware = 1,
                 .has_dvb      = 1,
                 .dvb_gpio     = evga_indtube_digital,
-                .ir_codes     = &IR_KEYTABLE(evga_indtube),
+                .ir_codes     = RC_MAP_EVGA_INDTUBE,
                 .input        = { {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = TVP5150_COMPOSITE0,
@@ -2335,21 +2335,21 @@ void em28xx_register_i2c_ir(struct em28xx *dev)
         switch (dev->model) {
         case EM2800_BOARD_TERRATEC_CINERGY_200:
         case EM2820_BOARD_TERRATEC_CINERGY_250:
-                dev->init_data.ir_codes = &IR_KEYTABLE(em_terratec);
+                dev->init_data.ir_codes = RC_MAP_EM_TERRATEC;
                 dev->init_data.get_key = em28xx_get_key_terratec;
                 dev->init_data.name = "i2c IR (EM28XX Terratec)";
                 break;
         case EM2820_BOARD_PINNACLE_USB_2:
-                dev->init_data.ir_codes = &IR_KEYTABLE(pinnacle_grey);
+                dev->init_data.ir_codes = RC_MAP_PINNACLE_GREY;
                 dev->init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
                 dev->init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
                 break;
         case EM2820_BOARD_HAUPPAUGE_WINTV_USB_2:
-                dev->init_data.ir_codes = &IR_KEYTABLE(rc5_hauppauge_new);
+                dev->init_data.ir_codes = RC_MAP_RC5_HAUPPAUGE_NEW;
                 dev->init_data.get_key = em28xx_get_key_em_haup;
                 dev->init_data.name = "i2c IR (EM2840 Hauppauge)";
         case EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE:
-                dev->init_data.ir_codes = &IR_KEYTABLE(winfast_usbii_deluxe);;
+                dev->init_data.ir_codes = RC_MAP_WINFAST_USBII_DELUXE;;
                 dev->init_data.get_key = em28xx_get_key_winfast_usbii_deluxe;
                 dev->init_data.name = "i2c IR (EM2820 Winfast TV USBII Deluxe)";
                 break;