[media] smipcie: add RC map into card configuration options

Remove the if..else statement from smipcie-ir.c and add the remote
controller map as a configuration parameter for the card.

Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/pci/smipcie/smipcie-ir.c b/drivers/media/pci/smipcie/smipcie-ir.c
index d737b5e767d003b6153a43d0eedf51339cb3ed47..826c7c75e64d13cdcea14a8c5c35981fc2085041 100644 (file)
--- a/drivers/media/pci/smipcie/smipcie-ir.c
+++ b/drivers/media/pci/smipcie/smipcie-ir.c
@@ -203,10 +203,7 @@ int smi_ir_init(struct smi_dev *dev)
        rc_dev->dev.parent = &dev->pci_dev->dev;
 
        rc_dev->driver_type = RC_DRIVER_SCANCODE;
-       if (dev->info->type == SMI_TECHNOTREND_S2_4200)
-               rc_dev->map_name = RC_MAP_TT_1500;
-       else
-               rc_dev->map_name = RC_MAP_DVBSKY;
+       rc_dev->map_name = dev->info->rc_map;
 
        ir->rc_dev = rc_dev;
        ir->dev = dev;

diff --git a/drivers/media/pci/smipcie/smipcie-main.c b/drivers/media/pci/smipcie/smipcie-main.c
index 4a9275a331b600989d2dd3b49dab62743a8e465d..83981d611a79ff95ceb31a6b61ea5c97c83681d5 100644 (file)
--- a/drivers/media/pci/smipcie/smipcie-main.c
+++ b/drivers/media/pci/smipcie/smipcie-main.c
@@ -1067,6 +1067,7 @@ static struct smi_cfg_info dvbsky_s950_cfg = {
        .ts_1 = SMI_TS_DMA_BOTH,
        .fe_0 = DVBSKY_FE_NULL,
        .fe_1 = DVBSKY_FE_M88DS3103,
+       .rc_map = RC_MAP_DVBSKY,
 };
 
 static struct smi_cfg_info dvbsky_s952_cfg = {
@@ -1076,6 +1077,7 @@ static struct smi_cfg_info dvbsky_s952_cfg = {
        .ts_1 = SMI_TS_DMA_BOTH,
        .fe_0 = DVBSKY_FE_M88RS6000,
        .fe_1 = DVBSKY_FE_M88RS6000,
+       .rc_map = RC_MAP_DVBSKY,
 };
 
 static struct smi_cfg_info dvbsky_t9580_cfg = {
@@ -1085,6 +1087,7 @@ static struct smi_cfg_info dvbsky_t9580_cfg = {
        .ts_1 = SMI_TS_DMA_BOTH,
        .fe_0 = DVBSKY_FE_SIT2,
        .fe_1 = DVBSKY_FE_M88DS3103,
+       .rc_map = RC_MAP_DVBSKY,
 };
 
 static struct smi_cfg_info technotrend_s2_4200_cfg = {
@@ -1094,6 +1097,7 @@ static struct smi_cfg_info technotrend_s2_4200_cfg = {
        .ts_1 = SMI_TS_DMA_BOTH,
        .fe_0 = DVBSKY_FE_M88RS6000,
        .fe_1 = DVBSKY_FE_M88RS6000,
+       .rc_map = RC_MAP_TT_1500,
 };
 
 /* PCI IDs */

diff --git a/drivers/media/pci/smipcie/smipcie.h b/drivers/media/pci/smipcie/smipcie.h
index 5528e483ebc59da1aab9b3e91d5e49f2afeb6289..611e4f02caddd7f62380fded0f8b2133e45b0cf6 100644 (file)
--- a/drivers/media/pci/smipcie/smipcie.h
+++ b/drivers/media/pci/smipcie/smipcie.h
@@ -233,6 +233,7 @@ struct smi_cfg_info {
 #define DVBSKY_FE_SIT2          3
        int fe_0;
        int fe_1;
+       char *rc_map;
 };
 
 struct smi_rc {