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

Commit dd2e5a15 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: remove deprecated handle_to_dev() macro 



Update remaining users and remove deprecated handle_to_dev() macro

CC: Harald Welte <laforge@gnumonks.org>
CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-serial@vger.kernel.org
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 6838b03f

drivers/char/pcmcia/cm4000_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 


/* #define ATR_CSUM */



#define reader_to_dev(x)	(&handle_to_dev(x->p_dev))

#define reader_to_dev(x)	(&x->p_dev->dev)



/* n (debug level) is ignored */

/* additional debug output may be enabled by re-compiling with

drivers/char/pcmcia/cm4040_cs.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#include "cm4040_cs.h"





#define reader_to_dev(x)	(&handle_to_dev(x->p_dev))

#define reader_to_dev(x)	(&x->p_dev->dev)



/* n (debug level) is ignored */

/* additional debug output may be enabled by re-compiling with
@@ -539,7 +539,7 @@ static int cm4040_config_check(struct pcmcia_device *p_dev, 
	p_dev->io.IOAddrLines = cfg->io.flags & CISTPL_IO_LINES_MASK;



	rc = pcmcia_request_io(p_dev, &p_dev->io);

	dev_printk(KERN_INFO, &handle_to_dev(p_dev),

	dev_printk(KERN_INFO, &p_dev->dev,

		   "pcmcia_request_io returned 0x%x\n", rc);

	return rc;

}
@@ -561,7 +561,7 @@ static int reader_config(struct pcmcia_device *link, int devno) 


	fail_rc = pcmcia_request_configuration(link, &link->conf);

	if (fail_rc != 0) {

		dev_printk(KERN_INFO, &handle_to_dev(link),

		dev_printk(KERN_INFO, &link->dev,

			   "pcmcia_request_configuration failed 0x%x\n",

			   fail_rc);

		goto cs_release;

drivers/net/pcmcia/3c574_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int tc574_config(struct pcmcia_device *link) 
	}



	link->dev_node = &lp->node;

	SET_NETDEV_DEV(dev, &handle_to_dev(link));

	SET_NETDEV_DEV(dev, &link->dev);



	if (register_netdev(dev) != 0) {

		printk(KERN_NOTICE "3c574_cs: register_netdev() failed\n");

drivers/net/pcmcia/3c589_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ static int tc589_config(struct pcmcia_device *link) 
	printk(KERN_ERR "3c589_cs: invalid if_port requested\n");

    

    link->dev_node = &lp->node;

    SET_NETDEV_DEV(dev, &handle_to_dev(link));

    SET_NETDEV_DEV(dev, &link->dev);



    if (register_netdev(dev) != 0) {

	printk(KERN_ERR "3c589_cs: register_netdev() failed\n");

drivers/net/pcmcia/axnet_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static int axnet_config(struct pcmcia_device *link) 


    info->phy_id = (i < 32) ? i : -1;

    link->dev_node = &info->node;

    SET_NETDEV_DEV(dev, &handle_to_dev(link));

    SET_NETDEV_DEV(dev, &link->dev);



    if (register_netdev(dev) != 0) {

	printk(KERN_NOTICE "axnet_cs: register_netdev() failed\n");