Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9940ec36 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

[PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present 



Instead of the DEV_OK macro, drivers should use pcmcia_dev_present().

Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent e2d40963

drivers/char/pcmcia/cm4000_cs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1458,7 +1458,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, 
	       iminor(inode), ioctl_names[_IOC_NR(cmd)]);

	       iminor(inode), ioctl_names[_IOC_NR(cmd)]);





	link = dev_table[iminor(inode)];

	link = dev_table[iminor(inode)];

	if (!(DEV_OK(link))) {

	if (!pcmcia_dev_present(link)) {

		DEBUGP(4, dev, "DEV_OK false\n");

		DEBUGP(4, dev, "DEV_OK false\n");

		return -ENODEV;

		return -ENODEV;

	}

	}
@@ -1667,7 +1667,7 @@ static int cmm_open(struct inode *inode, struct file *filp) 
		return -ENODEV;

		return -ENODEV;





	link = dev_table[minor];

	link = dev_table[minor];

	if (link == NULL || !(DEV_OK(link)))

	if (link == NULL || !pcmcia_dev_present(link))

		return -ENODEV;

		return -ENODEV;





	if (link->open)

	if (link->open)

drivers/char/pcmcia/cm4040_cs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -452,7 +452,7 @@ static int cm4040_open(struct inode *inode, struct file *filp) 
		return -ENODEV;

		return -ENODEV;





	link = dev_table[minor];

	link = dev_table[minor];

	if (link == NULL || !(DEV_OK(link)))

	if (link == NULL || !pcmcia_dev_present(link))

		return -ENODEV;

		return -ENODEV;





	if (link->open)

	if (link->open)

drivers/net/pcmcia/3c574_cs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -728,7 +728,7 @@ static int el3_open(struct net_device *dev) 
	struct el3_private *lp = netdev_priv(dev);

	struct el3_private *lp = netdev_priv(dev);

	struct pcmcia_device *link = lp->p_dev;

	struct pcmcia_device *link = lp->p_dev;





	if (!DEV_OK(link))

	if (!pcmcia_dev_present(link))

		return -ENODEV;

		return -ENODEV;

	

	

	link->open++;

	link->open++;
@@ -1176,7 +1176,7 @@ static int el3_close(struct net_device *dev) 




	DEBUG(2, "%s: shutting down ethercard.\n", dev->name);

	DEBUG(2, "%s: shutting down ethercard.\n", dev->name);

	

	

	if (DEV_OK(link)) {

	if (pcmcia_dev_present(link)) {

		unsigned long flags;

		unsigned long flags;





		/* Turn off statistics ASAP.  We update lp->stats below. */

		/* Turn off statistics ASAP.  We update lp->stats below. */

drivers/net/pcmcia/3c589_cs.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -557,7 +557,7 @@ static int el3_open(struct net_device *dev) 
    struct el3_private *lp = netdev_priv(dev);

    struct el3_private *lp = netdev_priv(dev);

    struct pcmcia_device *link = lp->p_dev;

    struct pcmcia_device *link = lp->p_dev;

    

    

    if (!DEV_OK(link))

    if (!pcmcia_dev_present(link))

	return -ENODEV;

	return -ENODEV;





    link->open++;

    link->open++;
@@ -818,7 +818,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev) 
    unsigned long flags;

    unsigned long flags;

    struct pcmcia_device *link = lp->p_dev;

    struct pcmcia_device *link = lp->p_dev;





    if (DEV_OK(link)) {

    if (pcmcia_dev_present(link)) {

    	spin_lock_irqsave(&lp->lock, flags);

    	spin_lock_irqsave(&lp->lock, flags);

	update_stats(dev);

	update_stats(dev);

	spin_unlock_irqrestore(&lp->lock, flags);

	spin_unlock_irqrestore(&lp->lock, flags);
@@ -922,7 +922,7 @@ static void set_multicast_list(struct net_device *dev) 
    kio_addr_t ioaddr = dev->base_addr;

    kio_addr_t ioaddr = dev->base_addr;

    u16 opts = SetRxFilter | RxStation | RxBroadcast;

    u16 opts = SetRxFilter | RxStation | RxBroadcast;





    if (!(DEV_OK(link))) return;

    if (!pcmcia_dev_present(link)) return;

    if (dev->flags & IFF_PROMISC)

    if (dev->flags & IFF_PROMISC)

	opts |= RxMulticast | RxProm;

	opts |= RxMulticast | RxProm;

    else if (dev->mc_count || (dev->flags & IFF_ALLMULTI))

    else if (dev->mc_count || (dev->flags & IFF_ALLMULTI))
@@ -938,7 +938,7 @@ static int el3_close(struct net_device *dev) 
    

    

    DEBUG(1, "%s: shutting down ethercard.\n", dev->name);

    DEBUG(1, "%s: shutting down ethercard.\n", dev->name);





    if (DEV_OK(link)) {

    if (pcmcia_dev_present(link)) {

	/* Turn off statistics ASAP.  We update lp->stats below. */

	/* Turn off statistics ASAP.  We update lp->stats below. */

	outw(StatsDisable, ioaddr + EL3_CMD);

	outw(StatsDisable, ioaddr + EL3_CMD);

drivers/net/pcmcia/axnet_cs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -530,7 +530,7 @@ static int axnet_open(struct net_device *dev) 
    

    

    DEBUG(2, "axnet_open('%s')\n", dev->name);

    DEBUG(2, "axnet_open('%s')\n", dev->name);





    if (!DEV_OK(link))

    if (!pcmcia_dev_present(link))

	return -ENODEV;

	return -ENODEV;





    link->open++;

    link->open++;