fix compile breakage in drivers/input/gameport

fix compile breakage in drivers/input/gameport

Post by Adrian Bun » Tue, 19 Nov 2002 15:10:06



Hi Matthew,

could you check whether the patch below that does a name -> dev.name to
fix the following compile errors is correct?

<--  snip  -->

...
  gcc -Wp,-MD,drivers/input/gameport/.fm801-gp.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include    -DKBUILD_BASENAME=fm801_gp -DKBUILD_MODNAME=fm801_gp   -c -o drivers/input/gameport/fm801-gp.o drivers/input/gameport/fm801-gp.c
drivers/input/gameport/fm801-gp.c: In function `fm801_gp_probe':
drivers/input/gameport/fm801-gp.c:119: structure has no member named `name'
make[2]: *** [drivers/input/gameport/fm801-gp.o] Error 1
...
  gcc -Wp,-MD,drivers/input/gameport/.ns558.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include    -DKBUILD_BASENAME=ns558 -DKBUILD_MODNAME=ns558
   -c -o drivers/input/gameport/ns558.o drivers/input/gameport/ns558.c
drivers/input/gameport/ns558.c: In function `ns558_pnp_probe':
drivers/input/gameport/ns558.c:239: structure has no member named `name'
drivers/input/gameport/ns558.c:239: structure has no member named `name'
make[2]: *** [drivers/input/gameport/ns558.o] Error 1
...
  gcc -Wp,-MD,drivers/input/gameport/.vortex.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include    -DKBUILD_BASENAME=vortex -DKBUILD_MODNAME=vor
tex   -c -o drivers/input/gameport/vortex.o drivers/input/gameport/vortex.c
drivers/input/gameport/vortex.c: In function `vortex_probe':
drivers/input/gameport/vortex.c:130: structure has no member named `name'
drivers/input/gameport/vortex.c:149: structure has no member named `name'
make[2]: *** [drivers/input/gameport/vortex.o] Error 1

<--  snip  -->

TIA
Adrian

--- linux-2.5.48/drivers/input/gameport/fm801-gp.c.old  2002-11-18 13:39:24.000000000 +0100

        gameport_register_port(&gp->gameport);

        printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
-               pci->name, pci->slot_name, gp->gameport.speed);
+               pci->dev.name, pci->slot_name, gp->gameport.speed);

        return 0;
 }
--- linux-2.5.48/drivers/input/gameport/ns558.c.old     2002-11-18 13:48:45.000000000 +0100

        port->gameport.id.version = 0x100;

        sprintf(port->phys, "isapnp%d.%d/gameport0", PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
-       sprintf(port->name, "%s", dev->name[0] ? dev->name : "NS558 PnP Gameport");
+       sprintf(port->name, "%s", dev->dev.name[0] ? dev->dev.name : "NS558 PnP Gameport");

        gameport_register_port(&port->gameport);

--- linux-2.5.48/drivers/input/gameport/vortex.c.old    2002-11-18 13:51:06.000000000 +0100

        vortex->gameport.cooked_read = vortex_cooked_read;
        vortex->gameport.open = vortex_open;

-       vortex->gameport.name = dev->name;
+       vortex->gameport.name = dev->dev.name;
        vortex->gameport.phys = vortex->phys;
        vortex->gameport.id.bustype = BUS_PCI;

        gameport_register_port(&vortex->gameport);

        printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
-               dev->name, dev->slot_name, vortex->gameport.speed);
+               dev->dev.name, dev->slot_name, vortex->gameport.speed);

        return 0;
 }
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

fix compile breakage in drivers/input/gameport

Post by Vojtech Pavli » Tue, 19 Nov 2002 15:40:07



> Hi Matthew,

> could you check whether the patch below that does a name -> dev.name to
> fix the following compile errors is correct?

Looks Ok to me. Should I merge it in?

> <--  snip  -->

> ...
>   gcc -Wp,-MD,drivers/input/gameport/.fm801-gp.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include    -DKBUILD_BASENAME=fm801_gp -DKBUILD_MODNAME=fm801_gp   -c -o drivers/input/gameport/fm801-gp.o drivers/input/gameport/fm801-gp.c
> drivers/input/gameport/fm801-gp.c: In function `fm801_gp_probe':
> drivers/input/gameport/fm801-gp.c:119: structure has no member named `name'
> make[2]: *** [drivers/input/gameport/fm801-gp.o] Error 1
> ...
>   gcc -Wp,-MD,drivers/input/gameport/.ns558.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include    -DKBUILD_BASENAME=ns558 -DKBUILD_MODNAME=ns558
>    -c -o drivers/input/gameport/ns558.o drivers/input/gameport/ns558.c
> drivers/input/gameport/ns558.c: In function `ns558_pnp_probe':
> drivers/input/gameport/ns558.c:239: structure has no member named `name'
> drivers/input/gameport/ns558.c:239: structure has no member named `name'
> make[2]: *** [drivers/input/gameport/ns558.o] Error 1
> ...
>   gcc -Wp,-MD,drivers/input/gameport/.vortex.o.d -D__KERNEL__ -Iinclude -Wall -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2 -march=k6 -Iarch/i386/mach-generic -nostdinc -iwithprefix include    -DKBUILD_BASENAME=vortex -DKBUILD_MODNAME=vor
> tex   -c -o drivers/input/gameport/vortex.o drivers/input/gameport/vortex.c
> drivers/input/gameport/vortex.c: In function `vortex_probe':
> drivers/input/gameport/vortex.c:130: structure has no member named `name'
> drivers/input/gameport/vortex.c:149: structure has no member named `name'
> make[2]: *** [drivers/input/gameport/vortex.o] Error 1

> <--  snip  -->

> TIA
> Adrian

> --- linux-2.5.48/drivers/input/gameport/fm801-gp.c.old     2002-11-18 13:39:24.000000000 +0100
> +++ linux-2.5.48/drivers/input/gameport/fm801-gp.c 2002-11-18 13:46:45.000000000 +0100

>    gameport_register_port(&gp->gameport);

>    printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
> -          pci->name, pci->slot_name, gp->gameport.speed);
> +          pci->dev.name, pci->slot_name, gp->gameport.speed);

>    return 0;
>  }
> --- linux-2.5.48/drivers/input/gameport/ns558.c.old        2002-11-18 13:48:45.000000000 +0100
> +++ linux-2.5.48/drivers/input/gameport/ns558.c    2002-11-18 13:49:06.000000000 +0100

>    port->gameport.id.version = 0x100;

>    sprintf(port->phys, "isapnp%d.%d/gameport0", PCI_SLOT(dev->devfn), PCI_FUNC(dev->devfn));
> -  sprintf(port->name, "%s", dev->name[0] ? dev->name : "NS558 PnP Gameport");
> +  sprintf(port->name, "%s", dev->dev.name[0] ? dev->dev.name : "NS558 PnP Gameport");

>    gameport_register_port(&port->gameport);

> --- linux-2.5.48/drivers/input/gameport/vortex.c.old       2002-11-18 13:51:06.000000000 +0100
> +++ linux-2.5.48/drivers/input/gameport/vortex.c   2002-11-18 13:51:25.000000000 +0100

>    vortex->gameport.cooked_read = vortex_cooked_read;
>    vortex->gameport.open = vortex_open;

> -  vortex->gameport.name = dev->name;
> +  vortex->gameport.name = dev->dev.name;
>    vortex->gameport.phys = vortex->phys;
>    vortex->gameport.id.bustype = BUS_PCI;
>    vortex->gameport.id.vendor = dev->vendor;

>    gameport_register_port(&vortex->gameport);

>    printk(KERN_INFO "gameport: %s at pci%s speed %d kHz\n",
> -          dev->name, dev->slot_name, vortex->gameport.speed);
> +          dev->dev.name, dev->slot_name, vortex->gameport.speed);

>    return 0;
>  }

--
Vojtech Pavlik
SuSE Labs
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

fix compile breakage in drivers/input/gameport

Post by Adrian Bun » Sun, 24 Nov 2002 15:50:04




> > Hi Matthew,

> > could you check whether the patch below that does a name -> dev.name to
> > fix the following compile errors is correct?

> Looks Ok to me. Should I merge it in?

Yes.

TIA
Adrian

--

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

1. 2.5.5-dj1, small fix in drivers/input/gameport/Config.in

While looking through the Config.in files in 2.5.5-dj1 for missing
help texts in Config.help, I found that in drivers/input/gameport
we have both CONFIG_GAMEPORT_EMU10K1 and CONFIG_INPUT_EMU10K1,
and perhaps only one of these is needed.

Here is a snippet from the drivers/input/gameport/Makefile:

obj-$(CONFIG_GAMEPORT_CS614X)   += cs614x.o
obj-$(CONFIG_GAMEPORT_EMU10K1)  += emu10k1-gp.o
obj-$(CONFIG_GAMEPORT_FM801)    += fm801-gp.o

There is no help text for CONFIG_INPUT_EMU10K1, but there is
one for CONFIG_GAMEPORT_EMU10K1 in drivers/input/gameport/Config.help.
However, drivers/input/gameport/Config.in prompts for a setting for
CONFIG_INPUT_EMU10K1.

The following micro-patch is proposed:

Steven

--- linux-2.5.5-dj1/drivers/input/gameport/Config.in.orig       Tue Feb 26 12:01:38 2002

 dep_tristate '  Classic ISA and PnP gameport support' CONFIG_GAMEPORT_NS558 $CONFIG_GAMEPORT
 dep_tristate '  PDPI Lightning 4 gamecard support' CONFIG_GAMEPORT_L4 $CONFIG_GAMEPORT
-dep_tristate '  SB Live and Audigy gameport support' CONFIG_INPUT_EMU10K1 $CONFIG_GAMEPORT
+dep_tristate '  SB Live and Audigy gameport support' CONFIG_GAMEPORT_EMU10K1 $CONFIG_GAMEPORT
 dep_tristate '  Aureal Vortex and Vortex 2 gameport support' CONFIG_GAMEPORT_VORTEX $CONFIG_GAMEPORT
 dep_tristate '  ForteMedia FM801 gameport support' CONFIG_GAMEPORT_FM801 $CONFIG_GAMEPORT
 dep_tristate '  Crystal SoundFusion  gameport support' CONFIG_GAMEPORT_CS461x $CONFIG_GAMEPORT
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. display/mouse Lockup

3. fix compile breakage on drivers/scsi/ibmmca.c

4. Problem with 'voldg import' hanging

5. fix compile breakage on drivers/scsi/fd_mcs.c

6. 2.5.46 jfs compile error

7. fix compile breakage in drivers/net/irda/vlsi_ir.c

8. /tmp

9. fix compile breakage on drivers/scsi/NCR53c406a.c

10. fix compile breakage on drivers/scsi/seagate.c

11. fix compile breakage on drivers/scsi/wd7000.c

12. fix compile breakage on drivers/scsi/NCR53C9x.c

13. fix compile breakage in drivers/net/arcnet/com20020-pci.c