* Re: [KJ] Re: drivers/atm/he.c remove dead code
2004-12-20 12:35 [KJ] Re: drivers/atm/he.c remove dead code Domen Puncer
@ 2004-12-20 14:32 ` Marcel Sebek
2004-12-20 17:57 ` Greg KH
2004-12-20 20:01 ` Domen Puncer
2 siblings, 0 replies; 4+ messages in thread
From: Marcel Sebek @ 2004-12-20 14:32 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 2109 bytes --]
On Mon, Dec 20, 2004 at 01:35:41PM +0100, Domen Puncer wrote:
> On 19/12/04 21:38 +0100, Marcel Sebek wrote:
> > @@ -147,13 +120,13 @@ static u8 read_prom_byte(struct he_dev *
> >
> > /* globals */
> >
> > -struct he_dev *he_devs = NULL;
> > -static int disable64 = 0;
> > +struct he_dev *he_devs;
>
> This is not static, so it won't be initialized.
>
Thanks for reply. Corrected version follows.
Signed-off-by: Marcel Sebek <sebek64@post.cz>
diff -urpN linux-2.6/drivers/atm/he.c linux-2.6-new/drivers/atm/he.c
--- linux-2.6/drivers/atm/he.c 2004-12-04 14:00:13.000000000 +0100
+++ linux-2.6-new/drivers/atm/he.c 2004-12-20 15:28:47.000000000 +0100
@@ -87,28 +87,6 @@
#define USE_TPD_POOL
/* #undef CONFIG_ATM_HE_USE_SUNI */
-/* compatibility */
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,69)
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,9)
-#define __devexit_p(func) func
-#endif
-
-#ifndef MODULE_LICENSE
-#define MODULE_LICENSE(x)
-#endif
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3)
-#define pci_set_drvdata(pci_dev, data) (pci_dev)->driver_data = (data)
-#define pci_get_drvdata(pci_dev) (pci_dev)->driver_data
-#endif
-
#include "he.h"
#include "suni.h"
@@ -117,12 +95,7 @@ typedef void irqreturn_t;
#define hprintk(fmt,args...) printk(KERN_ERR DEV_LABEL "%d: " fmt, he_dev->number , ##args)
-#undef DEBUG
-#ifdef DEBUG
-#define HPRINTK(fmt,args...) printk(KERN_DEBUG DEV_LABEL "%d: " fmt, he_dev->number , ##args)
-#else
-#define HPRINTK(fmt,args...) do { } while (0)
-#endif /* DEBUG */
+#define HPRINTK(fmt,args...) pr_debug(DEV_LABEL "%d: " fmt, he_dev->number , ##args)
/* version definition */
@@ -148,12 +121,12 @@ static u8 read_prom_byte(struct he_dev *
/* globals */
struct he_dev *he_devs = NULL;
-static int disable64 = 0;
+static int disable64;
static short nvpibits = -1;
static short nvcibits = -1;
static short rx_skb_reserve = 16;
static int irq_coalesce = 1;
-static int sdh = 0;
+static int sdh;
static struct atmdev_ops he_ops =
{
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 4+ messages in thread* [KJ] Re: drivers/atm/he.c remove dead code
2004-12-20 12:35 [KJ] Re: drivers/atm/he.c remove dead code Domen Puncer
2004-12-20 14:32 ` Marcel Sebek
2004-12-20 17:57 ` Greg KH
@ 2004-12-20 20:01 ` Domen Puncer
2 siblings, 0 replies; 4+ messages in thread
From: Domen Puncer @ 2004-12-20 20:01 UTC (permalink / raw)
To: kernel-janitors
[-- Attachment #1: Type: text/plain, Size: 550 bytes --]
On 20/12/04 09:57 -0800, Greg KH wrote:
> On Mon, Dec 20, 2004 at 01:35:41PM +0100, Domen Puncer wrote:
> > On 19/12/04 21:38 +0100, Marcel Sebek wrote:
> > > @@ -147,13 +120,13 @@ static u8 read_prom_byte(struct he_dev *
> > >
> > > /* globals */
> > >
> > > -struct he_dev *he_devs = NULL;
> > > -static int disable64 = 0;
> > > +struct he_dev *he_devs;
> >
> > This is not static, so it won't be initialized.
>
> Huh? Since when is that a requirement? No, that will be initialized to
> NULL.
Right, thank you for correcting me.
Domen
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
^ permalink raw reply [flat|nested] 4+ messages in thread