aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/tifm_7xx1.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/misc/tifm_7xx1.c')
-rw-r--r--drivers/misc/tifm_7xx1.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index eafa5575f312..9dcff14e752c 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -10,8 +10,6 @@
10 */ 10 */
11 11
12#include <linux/tifm.h> 12#include <linux/tifm.h>
13#include <linux/dma-mapping.h>
14#include <linux/freezer.h>
15 13
16#define DRIVER_NAME "tifm_7xx1" 14#define DRIVER_NAME "tifm_7xx1"
17#define DRIVER_VERSION "0.8" 15#define DRIVER_VERSION "0.8"
@@ -41,8 +39,7 @@ static irqreturn_t tifm_7xx1_isr(int irq, void *dev_id)
41{ 39{
42 struct tifm_adapter *fm = dev_id; 40 struct tifm_adapter *fm = dev_id;
43 struct tifm_dev *sock; 41 struct tifm_dev *sock;
44 unsigned int irq_status; 42 unsigned int irq_status, cnt;
45 unsigned int cnt;
46 43
47 spin_lock(&fm->lock); 44 spin_lock(&fm->lock);
48 irq_status = readl(fm->addr + FM_INTERRUPT_STATUS); 45 irq_status = readl(fm->addr + FM_INTERRUPT_STATUS);
@@ -134,11 +131,10 @@ static void tifm_7xx1_switch_media(struct work_struct *work)
134{ 131{
135 struct tifm_adapter *fm = container_of(work, struct tifm_adapter, 132 struct tifm_adapter *fm = container_of(work, struct tifm_adapter,
136 media_switcher); 133 media_switcher);
134 struct tifm_dev *sock;
137 unsigned long flags; 135 unsigned long flags;
138 unsigned char media_id; 136 unsigned char media_id;
139 int cnt; 137 unsigned int socket_change_set, cnt;
140 struct tifm_dev *sock;
141 unsigned int socket_change_set;
142 138
143 spin_lock_irqsave(&fm->lock, flags); 139 spin_lock_irqsave(&fm->lock, flags);
144 socket_change_set = fm->socket_change_set; 140 socket_change_set = fm->socket_change_set;