drivers: dpram: fix compile errors

drivers/dpram/dpram.c

@@ -32,8 +32,6 @@
 
 #include <asm/irq.h>
 #include <asm/io.h>
-
-#include <mach/msm_battery.h>
 #include <mach/hardware.h>
 #include <asm/uaccess.h>
 #include <mach/gpio.h>
@@ -72,6 +70,7 @@
 
 struct smem_info {
  unsigned int silent_reset;
+ unsigned int ram_dump_level;
 };
 
 struct smem_info *smem_flag;
@@ -121,15 +120,9 @@ static dpram_device_t dpram_table[MAX_INDEX] = {
 
 static struct tty_struct *dpram_tty[MAX_INDEX];
 static struct ktermios *dpram_termios[MAX_INDEX];
-static struct ktermios *dpram_termios_locked[MAX_INDEX];
 
 extern void *smem_alloc(unsigned, unsigned);
 
-//Get charging status & charger Connect value!!!
-extern void get_charger_type(void);
-extern void msm_batt_check_event(void);
-extern int get_charging_status(void);
-
 static void print_smem(void);
 static void dpram_ramdump(void);
 
@@ -383,6 +376,9 @@ extern struct class *sec_class;
 struct device *dpram_dev;
 struct device *pm_dev;
 struct timer_list power_down_timer;
+void power_down_registertimer(struct timer_list* ptimer, unsigned long timeover );
+void power_down_timeout(unsigned long arg);
+bool power_down;
 
 static ssize_t show_info(struct device *d,
  struct device_attribute *attr, char *buf)
@@ -1328,10 +1324,6 @@ static void cmd_chg_detect_noti(void)
  u16 value;
  u16 irq_clear = 0x0000;
 
- get_charger_type();
- get_charging_status();
- msm_batt_check_event();
-
  READ_FROM_DPRAM(&value,
  DPRAM_PHONE2PDA_INTERRUPT_ADDRESS,
  sizeof(value));
@@ -1352,9 +1344,6 @@ static void cmd_chg_state_changed(void)
 {
  u16 value;
  u16 irq_clear = 0x0000;
-
- get_charging_status();
- msm_batt_check_event();
 
  READ_FROM_DPRAM(&value,
  DPRAM_PHONE2PDA_INTERRUPT_ADDRESS,
@@ -1401,9 +1390,6 @@ static void command_handler(u16 cmd)
  case INT_MASK_CMD_CHG_STATE_CHANGED:
  cmd_chg_state_changed();
  break;
- case INT_MASK_CMD_CHG_FUEL_ALERT:
- msm_battery_fuel_alert();
- break;
  default:
  dprintk("Unknown command..\n");
  }
@@ -1600,7 +1586,6 @@ static int register_dpram_driver(void)
 
  dpram_tty_driver->ttys = dpram_tty;
  dpram_tty_driver->termios = dpram_termios;
- dpram_tty_driver->termios_locked = dpram_termios_locked;
 
  /* @LDK@ register tty driver */
  retval = tty_register_driver(dpram_tty_driver);
@@ -1624,7 +1609,7 @@ static void init_devices(void)
  int i;
 
  for (i = 0; i < MAX_INDEX; i++) {
- init_SEMAPHORE(&dpram_table[i].serial.sem);
+ sema_init(&dpram_table[i].serial.sem, 1);
 
  dpram_table[i].serial.open_count = 0;
  dpram_table[i].serial.tty = NULL;
@@ -1843,7 +1828,6 @@ void power_down_registertimer(struct timer_list *ptimer,
  ptimer->function = power_down_timeout;
  add_timer(ptimer);
 }
-EXPORT_SYMBOL(power_down_registertimer);
 
 void power_down_timeout(unsigned long arg)
 {
@@ -1855,7 +1839,6 @@ void power_down_timeout(unsigned long arg)
  smem_flag->silent_reset = 0xAEAEAEAE;
  msm_proc_comm_reset_modem_now();
 }
-EXPORT_SYMBOL(power_down_timeout);
 
 static int silent_read_proc_debug(char *page, char **start, off_t offset,
  int count, int *eof, void *data)
@@ -1937,7 +1920,7 @@ static int dump_write_proc_debug(struct file *file, const char *buffer,
  return -EINVAL;
  }
 
- smem_flag->silent_reset->ram_dump_level = dump_enable_flag;
+ smem_flag->ram_dump_level = dump_enable_flag;
 
  if (!smem_flag)
  pr_err("smem_flag is NULL!");

drivers/dpram/multipdp.c

@@ -269,7 +269,6 @@ struct pdp_info {
  int refcount;
  struct tty_struct *tty_table[1];
  struct ktermios *termios[1];
- struct ktermios *termios_locked[1];
  char tty_name[16];
  struct tty_struct *tty;
  struct semaphore write_lock;
@@ -1464,7 +1463,6 @@ static int vs_add_dev(struct pdp_info *dev)
  /* 2.6 kernel porting */
  tty_driver->ttys = dev->vs_dev.tty_table;
  tty_driver->termios = dev->vs_dev.termios;
- tty_driver->termios_locked = dev->vs_dev.termios_locked;
 
  tty_set_operations(tty_driver, &multipdp_tty_ops);
  return tty_register_driver(tty_driver);
@@ -1792,7 +1790,7 @@ static int pdp_activate(struct pdp_arg *pdp_arg, unsigned type, unsigned flags)
  DPRINTK(2, "%s(id: %u) network device created\n",
  net->name, dev->id);
  } else if (type == DEV_TYPE_SERIAL) {
- init_MUTEX(&dev->vs_dev.write_lock);
+ sema_init(&dev->vs_dev.write_lock, 1);
 
  strncpy(dev->vs_dev.tty_name,
  pdp_arg->ifname,