lkml.org 
[lkml]   [2003]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
SubjectRe: [PATCH][ATM] cleanup nicstar, suni and idt77105
Date
From
In message <20030308.130112.09061347.davem@redhat.com>,"David S. Miller" writes:
>This patch doesn't apply at all, it deletes lines referencing
>idt77105_priv_lock but that does not appear in the sources.

yes that's my fault. i had an intermediate change i forgot about.
this would be the correct diff for idt77105 --

Index: linux/drivers/atm/idt77105.c
===================================================================
RCS file: /home/chas/CVSROOT/linux/drivers/atm/idt77105.c,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -r1.1 -r1.3
--- linux/drivers/atm/idt77105.c 20 Feb 2003 13:45:03 -0000 1.1
+++ linux/drivers/atm/idt77105.c 5 Mar 2003 16:39:56 -0000 1.3
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/capability.h>
#include <linux/atm_idt77105.h>
+#include <linux/spinlock.h>
#include <asm/system.h>
#include <asm/param.h>
#include <asm/uaccess.h>
@@ -38,6 +39,7 @@
unsigned char old_mcr; /* storage of MCR reg while signal lost */
};

+static spinlock_t idt77105_priv_lock = SPIN_LOCK_UNLOCKED;

#define PRIV(dev) ((struct idt77105_priv *) dev->phy_data)

@@ -144,12 +146,11 @@
unsigned long flags;
struct idt77105_stats stats;

- save_flags(flags);
- cli();
+ spin_lock_irqsave(&idt77105_priv_lock, flags);
memcpy(&stats, &PRIV(dev)->stats, sizeof(struct idt77105_stats));
if (zero)
memset(&PRIV(dev)->stats, 0, sizeof(struct idt77105_stats));
- restore_flags(flags);
+ spin_unlock_irqrestore(&idt77105_priv_lock, flags);
if (arg == NULL)
return 0;
return copy_to_user(arg, &PRIV(dev)->stats,
@@ -267,11 +268,10 @@
if (!(PRIV(dev) = kmalloc(sizeof(struct idt77105_priv),GFP_KERNEL)))
return -ENOMEM;
PRIV(dev)->dev = dev;
- save_flags(flags);
- cli();
+ spin_lock_irqsave(&idt77105_priv_lock, flags);
PRIV(dev)->next = idt77105_all;
idt77105_all = PRIV(dev);
- restore_flags(flags);
+ spin_unlock_irqrestore(&idt77105_priv_lock, flags);
memset(&PRIV(dev)->stats,0,sizeof(struct idt77105_stats));

/* initialise dev->signal from Good Signal Bit */
@@ -305,11 +305,9 @@
idt77105_stats_timer_func(0); /* clear 77105 counters */
(void) fetch_stats(dev,NULL,1); /* clear kernel counters */

- cli();
- if (!start_timer) restore_flags(flags);
- else {
+ spin_lock_irqsave(&idt77105_priv_lock, flags);
+ if (start_timer) {
start_timer = 0;
- restore_flags(flags);

init_timer(&stats_timer);
stats_timer.expires = jiffies+IDT77105_STATS_TIMER_PERIOD;
@@ -321,32 +319,11 @@
restart_timer.function = idt77105_restart_timer_func;
add_timer(&restart_timer);
}
+ spin_unlock_irqrestore(&idt77105_priv_lock, flags);
return 0;
}


-static const struct atmphy_ops idt77105_ops = {
- idt77105_start,
- idt77105_ioctl,
- idt77105_int
-};
-
-
-int __init idt77105_init(struct atm_dev *dev)
-{
- MOD_INC_USE_COUNT;
-
- dev->phy = &idt77105_ops;
- return 0;
-}
-
-
-/*
- * TODO: this function should be called through phy_ops
- * but that will not be possible for some time as there is
- * currently a freeze on modifying that structure
- * -- Greg Banks, 13 Sep 1999
- */
int idt77105_stop(struct atm_dev *dev)
{
struct idt77105_priv *walk, *prev;
@@ -372,30 +349,33 @@
}
}

- MOD_DEC_USE_COUNT;
return 0;
}


+static const struct atmphy_ops idt77105_ops = {
+ .start = idt77105_start,
+ .ioctl = idt77105_ioctl,
+ .interrupt = idt77105_int,
+ .stop = idt77105_stop,
+};

-EXPORT_SYMBOL(idt77105_init);
-EXPORT_SYMBOL(idt77105_stop);
-
-MODULE_LICENSE("GPL");
-
-#ifdef MODULE

-int init_module(void)
+int idt77105_init(struct atm_dev *dev)
{
+ dev->phy = &idt77105_ops;
return 0;
}

+EXPORT_SYMBOL(idt77105_init);

-void cleanup_module(void)
+static void __exit idt77105_exit(void)
{
/* turn off timers */
del_timer(&stats_timer);
del_timer(&restart_timer);
}

-#endif
+module_exit(idt77105_exit);
+
+MODULE_LICENSE("GPL");
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
\
 
 \ /
  Last update: 2005-03-22 13:33    [W:0.096 / U:8.800 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site