Re: 2.6.3-mm4

From: David Martínez Moreno
Date: Thu Feb 26 2004 - 10:52:23 EST


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

El Jueves, 26 de Febrero de 2004 03:55, Andrew Morton escribió:
> ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.3/2.6.3-m
>m4/
>
> - Big knfsd update. Mainly for nfsv4
>
> - DVB udpate
>
> - Various fixes

Hello, Andrew, I jumped from rc1-mm1 to this and found that somebody finally
touched ini9100 driver, but it needs further cleaning. It doesn't compile
properly, and give warnings.

Attached patch fixes compilation of ini9100u driver and cleans several
unneeded definitions. It applies cleanly to 2.6.3-mm4 (I think).

Could you please review, because although simple, I'm scared, I don't really
know if my patch is doing the Right Thing (tm)? Thanks. :-)

Regards,


Ender.
- --
What was that, honey? It was bad. It had no fire, no energy, no nothing.
So tomorrow from 5 to 7 will you PLEASE act like you have more than a
two word vocabulary. It must be green.
-- DJ Ruby Rhod (The Fifth Element).
- --
Servicios de red - Network services
RedIRIS - Spanish Academic Network for Research and Development
Madrid (Spain)
Tlf (+34) 91.585.51.50
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAPhW3Ws/EhA1iABsRAoqPAJ4m9/jMcJ9/W54qLwEhKn9uC9AKOACeOJ2u
wy7M+GgPS8dWP2nR0IoeBnw=
=p/NV
-----END PGP SIGNATURE-----
--- drivers/scsi/ini9100u.c.orig 2004-02-26 14:12:32.000000000 +0100
+++ drivers/scsi/ini9100u.c 2004-02-26 14:13:27.000000000 +0100
@@ -180,14 +180,7 @@

static char *setup_str = (char *) NULL;

-static irqreturn_t i91u_intr0(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr1(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr2(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr3(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr4(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr5(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr6(int irq, void *dev_id, struct pt_regs *);
-static irqreturn_t i91u_intr7(int irq, void *dev_id, struct pt_regs *);
+static struct Scsi_Host *hreg;

static void i91u_panic(char *msg);

@@ -340,7 +333,6 @@
int i91u_detect(Scsi_Host_Template * tpnt)
{
HCS *pHCB;
- struct Scsi_Host *hreg;
unsigned long i; /* 01/14/98 */
int ok = 0, iAdapters;
ULONG dBiosAdr;