[PATCH] pcmcia driver model support [2/5]

From: Adam Belay (ambx1_at_neo.rr.com)
Date: 08/06/04

  • Next message: Adam Belay: "[PATCH] pcmcia driver model support [3/5]" 
    Date:	Thu, 5 Aug 2004 22:24:51 +0000
To: rmk@arm.linux.org.uk

    [PCMCIA] update network drivers

    This patch updates pcmcia network drivers so that their class devices are linked
    to the correct physical device.

    diff -urw a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
    --- a/drivers/net/pcmcia/3c574_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/3c574_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -519,6 +519,7 @@
     
             link->state &= ~DEV_CONFIG_PENDING;
             link->dev = &lp->node;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
             if (register_netdev(dev) != 0) {
                     printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n");
    diff -urw a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
    --- a/drivers/net/pcmcia/3c589_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/3c589_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -391,6 +391,7 @@
         
         link->dev = &lp->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         if (register_netdev(dev) != 0) {
             printk(KERN_ERR "3c589_cs: register_netdev() failed\n");
    diff -urw a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
    --- a/drivers/net/pcmcia/axnet_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/axnet_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -458,6 +458,7 @@
         info->phy_id = (i < 32) ? i : -1;
         link->dev = &info->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         if (register_netdev(dev) != 0) {
             printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n");
    diff -urw a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
    --- a/drivers/net/pcmcia/com20020_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/com20020_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -394,6 +394,7 @@
     
         link->dev = &info->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         i = com20020_found(dev, 0); /* calls register_netdev */
         
    diff -urw a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
    --- a/drivers/net/pcmcia/fmvj18x_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/fmvj18x_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -591,6 +591,7 @@
         lp->cardtype = cardtype;
         link->dev = &lp->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         if (register_netdev(dev) != 0) {
             printk(KERN_NOTICE "fmvj18x_cs: register_netdev() failed\n");
    diff -urw a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
    --- a/drivers/net/pcmcia/ibmtr_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/ibmtr_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -366,6 +366,7 @@
     
         link->dev = &info->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         i = ibmtr_probe_card(dev);
         if (i != 0) {
    diff -urw a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
    --- a/drivers/net/pcmcia/nmclan_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/nmclan_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -775,6 +775,7 @@
     
       link->dev = &lp->node;
       link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
       i = register_netdev(dev);
       if (i != 0) {
    diff -urw a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
    --- a/drivers/net/pcmcia/pcnet_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/pcnet_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -722,6 +722,7 @@
     
         link->dev = &info->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
     #ifdef CONFIG_NET_POLL_CONTROLLER
         dev->poll_controller = ei_poll;
    diff -urw a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
    --- a/drivers/net/pcmcia/smc91c92_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/smc91c92_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -1022,6 +1022,7 @@
     
         link->dev = &smc->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         if (register_netdev(dev) != 0) {
             printk(KERN_ERR "smc91c92_cs: register_netdev() failed\n");
    diff -urw a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
    --- a/drivers/net/pcmcia/xirc2ps_cs.c 2004-08-05 13:05:35.000000000 +0000
    +++ b/drivers/net/pcmcia/xirc2ps_cs.c 2004-08-05 13:30:37.000000000 +0000
    @@ -1121,6 +1121,7 @@
     
         link->dev = &local->node;
         link->state &= ~DEV_CONFIG_PENDING;
    + SET_NETDEV_DEV(dev, pcmcia_lookup_device(handle));
     
         if ((err=register_netdev(dev))) {
             printk(KNOT_XIRC "register_netdev() failed\n");
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

  • Next message: Adam Belay: "[PATCH] pcmcia driver model support [3/5]"