فهرست منبع

Remove gsensor API from 'commander_c181' branch.

Alfa 2 هفته پیش
والد
کامیت
49cc16277a
2فایلهای تغییر یافته به همراه3 افزوده شده و 11 حذف شده
  1. 1 1
      Makefile
  2. 2 10
      main.c

+ 1 - 1
Makefile

@@ -3,7 +3,7 @@
 MODULE_NAME := opal
 obj-m := opal.o
 
-opal-objs := main.o led.o light_ring.o ssegment.o ec_version.o buzzer.o fan.o writeprotect.o myname.o cash_drawers.o batteryled.o watchdog.o power.o switches.o backlight.o gsensor.o lcd_2x20.o smart_battery.o voltage_sysfs.o led_heartbeat.o sysfs_power.o vbat.o temperature_sysfs.o
+opal-objs := main.o led.o light_ring.o ssegment.o ec_version.o buzzer.o fan.o writeprotect.o myname.o cash_drawers.o batteryled.o watchdog.o power.o switches.o backlight.o lcd_2x20.o smart_battery.o voltage_sysfs.o led_heartbeat.o sysfs_power.o vbat.o temperature_sysfs.o
 
 PROJECT_NAME ?= 1
 POS ?= 1

+ 2 - 10
main.c

@@ -30,7 +30,7 @@
 #include "power.h"
 #include "switches.h"
 #include "backlight.h"
-#include "gsensor.h"
+//#include "gsensor.h"
 #include "lcd_2x20.h"
 #include "smart_battery.h"
 #include "voltage_sysfs.h"
@@ -145,17 +145,12 @@ static int __init all_driver_init(void)
         printk(KERN_ERR "sssegment_init failed\n");
         goto out_led;
     }
-    ret = gsensor_init_main();
-    if (ret != 0) {
-        printk(KERN_ERR "gsensor_init failed\n");
-        goto out_ssegment;
-    }
 
     ret = lcd2x20_init();
     if(ret != 0)
     {
         printk(KERN_ERR "lcd2x20_init failed\n");
-        goto out_gensor;
+        goto out_ssegment;
     }
 
     ret = batteryled_init();
@@ -216,8 +211,6 @@ out_batteryled:
     batteryled_exit();
 out_lcd:
     lcd2x20_exit();
-out_gensor:
-    gsensor_exit_main();
 out_ssegment:
     ssegment_exit();
 out_led:
@@ -268,7 +261,6 @@ static void __exit all_driver_exit(void)
     light_ring_exit();
     led_exit();
     ssegment_exit();
-    gsensor_exit_main();
     lcd2x20_exit();
     battery_acpi_driver_exit();
     voltage_sysfs_exit();