* [TRIVIAL] Patch to for Cyclades ISA serial board under 2.6
@ 2003-09-25 15:02 Shine Mohamed
0 siblings, 0 replies; 3+ messages in thread
From: Shine Mohamed @ 2003-09-25 15:02 UTC (permalink / raw)
To: linux-kernel; +Cc: krishnakumar
Quick patch to remove unused variables in Cyclades.c
This patch was sent earlier but the patching was done in wrong way
.... So submitting a correctly patched one.
--- drivers/char/cyclades.c.orig 2003-09-25 19:04:22.000000000 +0530
+++ drivers/char/cyclades.c 2003-09-25 19:07:45.000000000 +0530
@@ -5665,8 +5665,7 @@
cy_cleanup_module(void)
{
int i;
- int e1, e2;
- unsigned long flags;
+ int e1;
#ifndef CONFIG_CYZ_INTR
if (cyz_timeron){
^ permalink raw reply [flat|nested] 3+ messages in thread* [TRIVIAL] Patch to for Cyclades ISA serial board under 2.6
@ 2003-09-20 5:26 Shine Mohamed
0 siblings, 0 replies; 3+ messages in thread
From: Shine Mohamed @ 2003-09-20 5:26 UTC (permalink / raw)
To: Linux Kernel Mailing List; +Cc: krishnakumar
Quick patch to remove unused variables in Cyclades.c
diff -urN linux-2.6.0-test5.orig/drivers/char/cyclades.c
linux-2.6.0-test5/drivers/char/cyclades.c
--- linux-2.6.0-test5.orig/drivers/char/cyclades.c 2003-09-09
01:19:57.000000000 +0530
+++ linux-2.6.0-test5/drivers/char/cyclades.c 2003-09-20 09:38:20.000000000
+0530
@@ -5665,8 +5665,7 @@
cy_cleanup_module(void)
{
int i;
- int e1, e2;
- unsigned long flags;
+ int e1;
#ifndef CONFIG_CYZ_INTR
if (cyz_timeron){
^ permalink raw reply [flat|nested] 3+ messages in thread* [TRIVIAL] Patch to for Cyclades ISA serial board under 2.6
@ 2003-08-27 17:33 John Stoffel
0 siblings, 0 replies; 3+ messages in thread
From: John Stoffel @ 2003-08-27 17:33 UTC (permalink / raw)
To: Linux Kernel Mailing List
Quick patch to get my 8 port Cyclades Cyclom-Y ISA card to work under
2.6.0-test3 and higher:
--- linux-2.6.0-test3/drivers/char/cyclades.c Sat Aug 9 00:33:22 2003
+++ linux-2.6.0-test1-mm2/drivers/char/cyclades.c Tue Jul 22 23:19:19 2003
@@ -867,6 +867,7 @@
static int cyz_issue_cmd(struct cyclades_card *, uclong, ucchar, uclong);
#ifdef CONFIG_ISA
static unsigned detect_isa_irq (volatile ucchar *);
+spinlock_t isa_card_lock = SPIN_LOCK_UNLOCKED;
#endif /* CONFIG_ISA */
static int cyclades_get_proc_info(char *, char **, off_t , int , int *, void *;
@@ -1050,14 +1051,14 @@
udelay(5000L);
/* Enable the Tx interrupts on the CD1400 */
- save_flags(flags); cli();
+ spin_lock_irqsave(&isa_card_lock,flags);
cy_writeb((u_long)address + (CyCAR<<index), 0);
cyy_issue_cmd(address, CyCHAN_CTL|CyENB_XMTR, index);
cy_writeb((u_long)address + (CyCAR<<index), 0);
cy_writeb((u_long)address + (CySRER<<index),
cy_readb(address + (CySRER<<index)) | CyTxRdy);
- restore_flags(flags);
+ spin_unlock_irqrestore(&isa_card_lock, flags);
/* Wait ... */
udelay(5000L);
@@ -5665,7 +5666,7 @@
cy_cleanup_module(void)
{
int i;
- int e1;
+ int e1, e2;
unsigned long flags;
#ifndef CONFIG_CYZ_INTR
@@ -5675,13 +5676,10 @@
}
#endif /* CONFIG_CYZ_INTR */
- save_flags(flags); cli();
-
if ((e1 = tty_unregister_driver(cy_serial_driver)))
printk("cyc: failed to unregister Cyclades serial driver(%d)\n",
e1);
- restore_flags(flags);
put_tty_driver(cy_serial_driver);
for (i = 0; i < NR_CARDS; i++) {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-09-25 15:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-09-25 15:02 [TRIVIAL] Patch to for Cyclades ISA serial board under 2.6 Shine Mohamed
-- strict thread matches above, loose matches on Subject: below --
2003-09-20 5:26 Shine Mohamed
2003-08-27 17:33 John Stoffel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®