12 files changed, 4 insertions, 81 deletions
diff --git a/hid-tminit.ko b/hid-tminit.ko
deleted file mode 100644
index 763336c..0000000
--- a/hid-tminit.ko
+++ /dev/null
diff --git a/hid-tminit.mod b/hid-tminit.mod
deleted file mode 100644
index 858ad57..0000000
--- a/hid-tminit.mod
+++ /dev/null
@@ -1,2 +0,0 @@
-/home/kimi/Documents/tmff2/hid-tminit.o
-
diff --git a/hid-tminit.mod.c b/hid-tminit.mod.c
deleted file mode 100644
index dbd2e54..0000000
--- a/hid-tminit.mod.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <linux/build-salt.h>
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-BUILD_SALT;
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-MODULE_INFO(name, KBUILD_MODNAME);
-
-__visible struct module __this_module
-__section(.gnu.linkonce.this_module) = {
-	.name = KBUILD_MODNAME,
-	.init = init_module,
-#ifdef CONFIG_MODULE_UNLOAD
-	.exit = cleanup_module,
-#endif
-	.arch = MODULE_ARCH_INIT,
-};
-
-#ifdef CONFIG_RETPOLINE
-MODULE_INFO(retpoline, "Y");
-#endif
-
-MODULE_INFO(depends, "hid");
-
-MODULE_ALIAS("hid:b0003g*v0000044Fp0000B65D");
-
-MODULE_INFO(srcversion, "49C62A898823BBE8124B035");
diff --git a/hid-tminit.mod.o b/hid-tminit.mod.o
deleted file mode 100644
index ce3c467..0000000
--- a/hid-tminit.mod.o
+++ /dev/null
diff --git a/hid-tminit.o b/hid-tminit.o
deleted file mode 100644
index ae3404b..0000000
--- a/hid-tminit.o
+++ /dev/null
diff --git a/hid-tmt300rs.c b/hid-tmt300rs.c
index 8b002c7..e29ede8 100644
--- a/hid-tmt300rs.c
+++ b/hid-tmt300rs.c
@@ -498,12 +498,8 @@ static enum hrtimer_restart t300rs_timer(struct hrtimer *t){
     struct t300rs_device_entry *t300rs = container_of(t, struct t300rs_device_entry, hrtimer);
     int max_count;
 
-    spin_lock_irqsave(&data_lock, data_flags);
-
     max_count = t300rs_timer_helper(t300rs);
     
-    spin_unlock_irqrestore(&data_lock, data_flags);
-
     if(max_count > 0){
         hrtimer_forward_now(&t300rs->hrtimer, ms_to_ktime(timer_msecs));
         return HRTIMER_RESTART;
@@ -719,7 +715,7 @@ static void t300rs_close(struct input_dev *dev){
     struct hid_device *hdev = input_get_drvdata(dev);
     struct t300rs_device_entry *t300rs;
     u8 *send_buffer = kzalloc(T300RS_BUFFER_LENGTH, GFP_ATOMIC);
-
+    
     t300rs = t300rs_get_device(hdev);
 
     send_buffer[0] = 0x60;
@@ -732,7 +728,6 @@ static void t300rs_close(struct input_dev *dev){
     }
 err:
     kfree(send_buffer);
-
     t300rs->close(dev);
     return;
 }
@@ -783,7 +778,6 @@ int t300rs_init(struct hid_device *hdev, const signed short *ff_bits){
 
     drv_data->device_props = t300rs;
 
-
     report_list = &hdev->report_enum[HID_OUTPUT_REPORT].report_list;
     list_for_each_entry(report, report_list, list){
         int fieldnum;
@@ -867,12 +861,12 @@ int t300rs_init(struct hid_device *hdev, const signed short *ff_bits){
 
     hrtimer_init(&t300rs->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
     t300rs->hrtimer.function = t300rs_timer;
-
+    
+    spin_unlock_irqrestore(&lock, lock_flags);
 
     t300rs_range_store(dev, &dev_attr_range, range, 10);
     t300rs_set_gain(input_dev, 0xffff);
 
-    t300rs_open(input_dev);
     hid_info(hdev, "force feedback for T300RS\n");
     return 0;
 
@@ -893,6 +887,7 @@ static int t300rs_probe(struct hid_device *hdev, const struct hid_device_id *id)
     struct t300rs_data *drv_data;
 
     spin_lock_init(&lock);
+    spin_lock_irqsave(&lock, lock_flags);
 
     drv_data = kzalloc(sizeof(struct t300rs_data), GFP_ATOMIC);
     if(!drv_data){
@@ -921,7 +916,6 @@ static int t300rs_probe(struct hid_device *hdev, const struct hid_device_id *id)
         hid_err(hdev, "t300rs_init failed\n");
         goto err;
     }
-
     return 0;
 err:
     kfree(drv_data);
@@ -938,8 +932,6 @@ static void t300rs_remove(struct hid_device *hdev){
     drv_data = hid_get_drvdata(hdev);
     t300rs = t300rs_get_device(hdev);
 
-    spin_lock_irqsave(&data_lock, data_flags);
-
     hrtimer_cancel(&t300rs->hrtimer);
 
     hid_hw_stop(hdev);
@@ -947,8 +939,6 @@ static void t300rs_remove(struct hid_device *hdev){
     kfree(drv_data);
     kfree(t300rs);
 
-    spin_unlock_irqrestore(&data_lock, data_flags);
-
     return;
 }
 
diff --git a/hid-tmt300rs.h b/hid-tmt300rs.h
index f3c8d97..ccdea78 100644
--- a/hid-tmt300rs.h
+++ b/hid-tmt300rs.h
@@ -21,9 +21,6 @@
 spinlock_t lock;
 unsigned long lock_flags;
 
-spinlock_t data_lock;
-unsigned long data_flags;
-
 static int timer_msecs = DEFAULT_TIMER_PERIOD;
 
 static const signed short t300rs_ff_effects[] = {
@@ -87,5 +84,3 @@ static u8 spring_values[] = {
 static u8 damper_values[] = {
     0xfc, 0x7f, 0xfc, 0x7f, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xfe, 0xff, 0xfc, 0x7f, 0xfc, 0x7f, 0x07
 };
-
-static u8 t300rs_ctrl_out[] = { 0x41, 0x48, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, };
diff --git a/hid-tmt300rs.ko b/hid-tmt300rs.ko
deleted file mode 100644
index 4a7c06a..0000000
--- a/hid-tmt300rs.ko
+++ /dev/null
diff --git a/hid-tmt300rs.mod b/hid-tmt300rs.mod
deleted file mode 100644
index 92bd18f..0000000
--- a/hid-tmt300rs.mod
+++ /dev/null
@@ -1,2 +0,0 @@
-/home/kimi/Documents/tmff2/hid-tmt300rs.o
-
diff --git a/hid-tmt300rs.mod.c b/hid-tmt300rs.mod.c
deleted file mode 100644
index 7d03495..0000000
--- a/hid-tmt300rs.mod.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include <linux/build-salt.h>
-#include <linux/module.h>
-#include <linux/vermagic.h>
-#include <linux/compiler.h>
-
-BUILD_SALT;
-
-MODULE_INFO(vermagic, VERMAGIC_STRING);
-MODULE_INFO(name, KBUILD_MODNAME);
-
-__visible struct module __this_module
-__section(.gnu.linkonce.this_module) = {
-	.name = KBUILD_MODNAME,
-	.init = init_module,
-#ifdef CONFIG_MODULE_UNLOAD
-	.exit = cleanup_module,
-#endif
-	.arch = MODULE_ARCH_INIT,
-};
-
-#ifdef CONFIG_RETPOLINE
-MODULE_INFO(retpoline, "Y");
-#endif
-
-MODULE_INFO(depends, "hid");
-
-MODULE_ALIAS("hid:b0003g*v0000044Fp0000B66E");
-
-MODULE_INFO(srcversion, "8A85E6A9A9E4442C81CA1CE");
diff --git a/hid-tmt300rs.mod.o b/hid-tmt300rs.mod.o
deleted file mode 100644
index f761a52..0000000
--- a/hid-tmt300rs.mod.o
+++ /dev/null
diff --git a/hid-tmt300rs.o b/hid-tmt300rs.o
deleted file mode 100644
index bc2808c..0000000
--- a/hid-tmt300rs.o
+++ /dev/null