arm64: dts: rockchip: enable mbox related for rk3368-tb

[firefly-linux-kernel-4.4.55.git] / drivers / power / rk30_factory_adc_battery.c

diff --git a/drivers/power/rk30_factory_adc_battery.c b/drivers/power/rk30_factory_adc_battery.c
index 6ae42e4fe29b453f4e3836b511ab9f2c0715e76e..69790668f05e7bdaab2704e4522badf5bc0780d2 100755 (executable)
--- a/drivers/power/rk30_factory_adc_battery.c
+++ b/drivers/power/rk30_factory_adc_battery.c
@@ -36,6 +36,7 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 #include <linux/power/rockchip-adc-battery.h>
+#include <linux/rk_keys.h>
 #include <linux/iio/iio.h>
 #include <linux/iio/machine.h>
 #include <linux/iio/driver.h>
@@ -237,7 +238,6 @@ extern int get_gadget_connect_flag(void);
 extern int dwc_otg_check_dpdm(void);
 static int  is_charge_ok(struct rk30_adc_battery_data *bat);
 static void rk30_adc_battery_voltage_samples(struct rk30_adc_battery_data *bat);
-extern void rk_send_wakeup_key(void);
 static  bool batt_gpio_is_valid(int number)
 {
        return number > 0 && number < 256;
@@ -2285,17 +2285,14 @@ static int rk30_adc_battery_probe(struct platform_device *pdev)
        gSecondsCnt = get_seconds();
        /*data = kzalloc(sizeof(*data), GFP_KERNEL);*/
        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
-       if (data == NULL) {
+       if (data == NULL)
                ret = -ENOMEM;
-               goto err_data_alloc_failed;
-       }
 
        /*pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);*/
        pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
-       if (pdata == NULL) {
+       if (pdata == NULL)
                ret = -ENOMEM;
-               goto err_pdata_alloc_failed;
-       }
+
        memset(data, 0, sizeof(struct rk30_adc_battery_data));
        gBatteryData = data;
        platform_set_drvdata(pdev, data);
@@ -2470,12 +2467,6 @@ err_dcirq_failed:
 
 #endif
 err_io_init:
-
-err_pdata_alloc_failed:
-       kfree(pdata);
-err_data_alloc_failed:
-       kfree(data);
-
        printk("rk30_adc_battery: error!\n");
     
        return ret;
@@ -2500,8 +2491,6 @@ static int rk30_adc_battery_remove(struct platform_device *pdev)
        power_supply_unregister(&data ->bat);
        if (batt_gpio_is_valid(pdata->dc_det_pin))
                free_irq(gpio_to_irq(pdata->dc_det_pin), data);
-
-       kfree(data);
        
        return 0;
 }