[Kernel-janitors] tcic kj audit

[Kernel-janitors] tcic kj audit

[Chuck Short]

[-- Attachment #1: Type: text/plain, Size: 92 bytes --]

Hi,

This patch changes char* into char[] and add's KERN_* to some printks to 
tcic.

chuck

[-- Attachment #2: tcic-kj-audit.patch --]
[-- Type: text/plain, Size: 1584 bytes --]

--- linux-2.6.4.orig/drivers/pcmcia/tcic.c	2004-03-11 02:55:28.000000000 +0000
+++ linux-2.6.4/drivers/pcmcia/tcic.c	2004-03-16 16:24:56.000000000 +0000
@@ -58,7 +58,7 @@
 #ifdef PCMCIA_DEBUG
 static int pc_debug = PCMCIA_DEBUG;
 MODULE_PARM(pc_debug, "i");
-static const char *version =
+static const char version[] =
 "tcic.c 1.111 2000/02/15 04:13:12 (David Hinds)";
 #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
 #else
@@ -337,7 +337,7 @@ static int __init is_active(int s)
 
     if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) &&
 	(scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) &&
-	(check_region(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
+	(region_request(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
 	return 1;
     else
 	return 0;
@@ -403,7 +403,7 @@ static int __init init_tcic(void)
     sock = 0;
 
     if (!request_region(tcic_base, 16, "tcic-2")) {
-	printk("could not allocate ports,\n ");
+	printk(KERN_INFO "could not allocate ports,\n ");
 	driver_unregister(&tcic_driver);
 	return -ENODEV;
     }
@@ -505,11 +505,11 @@ static int __init init_tcic(void)
     }
     
     if (socket_table[0].socket.irq_mask & (1 << 11))
-	printk("sktirq is irq 11, ");
+	printk(KERN_INFO "sktirq is irq 11, ");
     if (cs_irq != 0)
-	printk("status change on irq %d\n", cs_irq);
+	printk(KERN_NOTICE "status change on irq %d\n", cs_irq);
     else
-	printk("polled status, interval = %d ms\n",
+	printk(KERN_INFO "polled status, interval = %d ms\n",
 	       poll_interval * 1000 / HZ);
     
     for (i = 0; i < sockets; i++) {

[-- Attachment #3: Type: text/plain, Size: 163 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [Kernel-janitors] tcic kj audit

[Dave Jones]

On Tue, Mar 16, 2004 at 08:33:49PM +0000, Chuck Short wrote:
 > @@ -337,7 +337,7 @@ static int __init is_active(int s)
 >  
 >      if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) &&
 >  	(scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) &&
 > -	(check_region(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
 > +	(region_request(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
 >  	return 1;
 >      else
 >  	return 0;

I guess you didn't even compile test this one ?

You'll also need to release the region at some point.
check_region fixes aren't just a simple search & replace.

		Dave
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [Kernel-janitors] tcic kj audit

[Domen Puncer]

On Tuesday 16 of March 2004 21:33, Chuck Short wrote:
> Hi,
> 
> This patch changes char* into char[] and add's KERN_* to some printks to 
> tcic.
> 
> chuck
> 

@@ -337,7 +337,7 @@ static int __init is_active(int s)
 
     if ((sstat & TCIC_SSTAT_CD) && (pwr & TCIC_PWR_VCC(s)) &&
        (scf1 & TCIC_SCF1_IOSTS) && (ioctl & TCIC_ICTL_ENA) &&
-       (check_region(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
+       (region_request(base, num) != 0) && ((base & 0xfeef) != 0x02e8))
---
What is this?
I guess you didn't compile test it :-)


	Domen
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors