Revert "[9610] dirvers: modem_if: Handling dsds from persist.radio.multisim.config"

This reverts commit e10cd6711e74846cf421e531c7dd40ec09813743.

diff --git a/drivers/misc/modem_if/modem_io_device.c b/drivers/misc/modem_if/modem_io_device.c
index 522be7613436046bc17d8786e6e82f6e2e1487c4..70d91f910b547de08265fbc4828b389a7edf5a88 100644 (file)
--- a/drivers/misc/modem_if/modem_io_device.c
+++ b/drivers/misc/modem_if/modem_io_device.c
@@ -976,20 +976,11 @@ static long misc_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
        char *buff;
        void __user *user_buff;
        unsigned long size;
-       int val;
 
        switch (cmd) {
        case IOCTL_MODEM_ON:
                if (mc->ops.modem_on) {
                        mif_err("%s: IOCTL_MODEM_ON\n", iod->name);
-                       if (arg) {
-                               user_buff = (void __user *)arg;
-
-                               if (copy_from_user(&val, user_buff, sizeof(val)))
-                                       return -EFAULT;
-
-                               mc->sim_slot_cnt = val;
-                       }
                        return mc->ops.modem_on(mc);
                }
                mif_err("%s: !mc->ops.modem_on\n", iod->name);

diff --git a/drivers/misc/modem_if/modem_main.c b/drivers/misc/modem_if/modem_main.c
index 17eca257304ee04e2d221ae47dbdd0ba8301124f..5e2ce8e84172483e58cad999f9e9dfc4d1521ab0 100644 (file)
--- a/drivers/misc/modem_if/modem_main.c
+++ b/drivers/misc/modem_if/modem_main.c
@@ -121,7 +121,6 @@ static struct modem_ctl *create_modemctl_device(struct platform_device *pdev,
        modemctl->msd = msd;
        modemctl->dev = dev;
        modemctl->phone_state = STATE_OFFLINE;
-       modemctl->sim_slot_cnt = 1;
 
        modemctl->mdm_data = pdata;
        modemctl->name = pdata->name;

diff --git a/drivers/misc/modem_if/modem_modemctl_device_sh333ap.c b/drivers/misc/modem_if/modem_modemctl_device_sh333ap.c
index d91cb63df3cb8f01de6afbd413973090d47070e5..a9f406a36fd36f67f1b70bc5d9edb02b04494983 100755 (executable)
--- a/drivers/misc/modem_if/modem_modemctl_device_sh333ap.c
+++ b/drivers/misc/modem_if/modem_modemctl_device_sh333ap.c
@@ -326,23 +326,16 @@ static int sh333ap_on(struct modem_ctl *mc)
                mif_err("get_hw_rev() ERROR\n");
        }
 
-       if (mc->sim_slot_cnt > 0) {
-               mbox_update_value(MCU_CP, mbx_ap_status, mc->sim_slot_cnt,
-                               sbi_ds_det_mask, sbi_ds_det_pos);
-               mif_err("System sim config: %d\n", mc->sim_slot_cnt);
+       ds_det = get_sim_socket_detection(np);
+       if (ds_det >= 0) {
+               mbox_update_value(MCU_CP, mbx_ap_status, ds_det,
+                       sbi_ds_det_mask, sbi_ds_det_pos);
        } else {
-               ds_det = get_sim_socket_detection(np);
-
-               if (ds_det >= 0) {
-                       mbox_update_value(MCU_CP, mbx_ap_status, ds_det,
-                               sbi_ds_det_mask, sbi_ds_det_pos);
-                       mif_err("SIM Socket Detection %d\n", ds_det);
-               } else {
-                       mif_err("get_sim_socket_detection() ERROR\n");
-               }
+               mif_err("get_sim_socket_detection() ERROR\n");
        }
 
        mif_err("System Revision %d\n", sys_rev);
+       mif_err("SIM Socket Detection %d\n", ds_det);
 
        spin_unlock_irqrestore(&mc->ap_status_lock, flags);
 

diff --git a/drivers/misc/modem_if/modem_prj.h b/drivers/misc/modem_if/modem_prj.h
index a4a769158af8bb8ae1d0536a5b2287e1a780ed66..c1315d68ae6415d4766e4606ad349c027f0b1c16 100644 (file)
--- a/drivers/misc/modem_if/modem_prj.h
+++ b/drivers/misc/modem_if/modem_prj.h
@@ -738,9 +738,6 @@ struct modem_ctl {
        unsigned int gpio_reset_req_n;
        unsigned int gpio_cp_reset;
 
-       /* for checking number of usim slot by rild*/
-       int sim_slot_cnt;
-
        /* for broadcasting AP's PM state (active or sleep) */
        unsigned int gpio_pda_active;
        unsigned int mbx_pda_active;