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

Commit 11221501 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_daq_dio24: remove pcmcia_device private data 



The private data, struct local_info_t, is not being used in the
driver. Remove it as well as the kzalloc/kfree.

Also, don't set the 'pcmcia_cur_dev' variable unless the pcmcia
probe is successful.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 07c5b441

drivers/staging/comedi/drivers/ni_daq_dio24.c

+2 −17
Original line number Original line Diff line number Diff line
@@ -184,11 +184,6 @@ static void dio24_detach(struct comedi_device *dev) 
		free_irq(dev->irq, dev);

		free_irq(dev->irq, dev);

};

};





struct local_info_t {

	struct pcmcia_device *link;

	struct bus_operations *bus;

};



static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,

static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev,

				    void *priv_data)

				    void *priv_data)

{

{
@@ -200,17 +195,8 @@ static int dio24_pcmcia_config_loop(struct pcmcia_device *p_dev, 




static int dio24_cs_attach(struct pcmcia_device *link)

static int dio24_cs_attach(struct pcmcia_device *link)

{

{

	struct local_info_t *local;

	int ret;

	int ret;





	local = kzalloc(sizeof(*local), GFP_KERNEL);

	if (!local)

		return -ENOMEM;

	local->link = link;

	link->priv = local;



	pcmcia_cur_dev = link;



	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO |

	link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_AUDIO |

		CONF_AUTO_SET_IO;

		CONF_AUTO_SET_IO;
@@ -227,6 +213,8 @@ static int dio24_cs_attach(struct pcmcia_device *link) 
	if (ret)

	if (ret)

		goto failed;

		goto failed;





	pcmcia_cur_dev = link;



	return 0;

	return 0;





failed:

failed:
@@ -237,9 +225,6 @@ static int dio24_cs_attach(struct pcmcia_device *link) 
static void dio24_cs_detach(struct pcmcia_device *link)

static void dio24_cs_detach(struct pcmcia_device *link)

{

{

	pcmcia_disable_device(link);

	pcmcia_disable_device(link);



	/* This points to the parent local_info_t struct */

	kfree(link->priv);

}

}





static const struct pcmcia_device_id dio24_cs_ids[] = {

static const struct pcmcia_device_id dio24_cs_ids[] = {