Commit 1ac71e5a authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: convert pcmcia_request_configuration to pcmcia_enable_device 



pcmcia_enable_device() now replaces pcmcia_request_configuration().
Instead of config_req_t, all necessary flags are either passed as
a parameter to pcmcia_enable_device(), or (in rare circumstances)
set in struct pcmcia_device -> flags.

With the last remaining user of include/pcmcia/cs.h gone, remove
all references.

CC: netdev@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-usb@vger.kernel.org
CC: laforge@gnumonks.org
CC: linux-mtd@lists.infradead.org
CC: alsa-devel@alsa-project.org
CC: linux-serial@vger.kernel.org
CC: Jiri Kosina <jkosina@suse.cz>
CC: linux-scsi@vger.kernel.org
Acked-by: Gustavo F. Padovan <padovan@profusion.mobi> (for drivers/bluetooth)
Tested-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 7feabb64

Documentation/pcmcia/driver-changes.txt

+6 −0
Original line number Diff line number Diff line 
This file details changes in 2.6 which affect PCMCIA card driver authors:

* pcmcia_request_configuration -> pcmcia_enable_device (as of 2.6.36)

   pcmcia_request_configuration() got renamed to pcmcia_enable_device(),

   as it mirrors pcmcia_disable_device(). Configuration settings are now

   stored in struct pcmcia_device, e.g. in the fields config_flags,

   config_index, config_base, vpp.



* pcmcia_request_window changes (as of 2.6.36)

   Instead of win_req_t, drivers are now requested to fill out

   struct pcmcia_device *p_dev->resource[2,3,4,5] for up to four ioport

drivers/ata/pata_pcmcia.c

+2 −3
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <linux/ata.h>

#include <linux/libata.h>



#include <pcmcia/cs.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ds.h>

#include <pcmcia/cisreg.h>
@@ -249,7 +248,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	/* Set up attributes in order to probe card and get resources */

	pdev->resource[0]->flags |= IO_DATA_PATH_WIDTH_AUTO;

	pdev->resource[1]->flags |= IO_DATA_PATH_WIDTH_8;

	pdev->conf.Attributes = CONF_ENABLE_IRQ;

	pdev->config_flags |= CONF_ENABLE_IRQ;



	/* See if we have a manufacturer identifier. Use it to set is_kme for

	   vendor quirks */
@@ -275,7 +274,7 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	if (!pdev->irq)

		goto failed;



	ret = pcmcia_request_configuration(pdev, &pdev->conf);

	ret = pcmcia_enable_device(pdev);

	if (ret)

		goto failed;

drivers/bluetooth/bluecard_cs.c

+2 −3
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
#include <linux/skbuff.h>

#include <linux/io.h>



#include <pcmcia/cs.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ciscode.h>

#include <pcmcia/ds.h>
@@ -865,7 +864,7 @@ static int bluecard_probe(struct pcmcia_device *link) 
	info->p_dev = link;

	link->priv = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->config_flags |= CONF_ENABLE_IRQ;



	return bluecard_config(link);

}
@@ -905,7 +904,7 @@ static int bluecard_config(struct pcmcia_device *link) 
	if (i != 0)

		goto failed;



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

	i = pcmcia_enable_device(link);

	if (i != 0)

		goto failed;

drivers/bluetooth/bt3c_cs.c

+2 −3
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <linux/device.h>

#include <linux/firmware.h>



#include <pcmcia/cs.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ciscode.h>

#include <pcmcia/ds.h>
@@ -660,7 +659,7 @@ static int bt3c_probe(struct pcmcia_device *link) 
	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->config_flags |= CONF_ENABLE_IRQ;



	return bt3c_config(link);

}
@@ -741,7 +740,7 @@ found_port: 
	if (i != 0)

		goto failed;



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

	i = pcmcia_enable_device(link);

	if (i != 0)

		goto failed;

drivers/bluetooth/btuart_cs.c

+2 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#include <asm/system.h>

#include <asm/io.h>



#include <pcmcia/cs.h>

#include <pcmcia/cistpl.h>

#include <pcmcia/ciscode.h>

#include <pcmcia/ds.h>
@@ -589,7 +588,7 @@ static int btuart_probe(struct pcmcia_device *link) 
	link->resource[0]->flags |= IO_DATA_PATH_WIDTH_8;

	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->config_flags |= CONF_ENABLE_IRQ;



	return btuart_config(link);

}
@@ -670,7 +669,7 @@ found_port: 
	if (i != 0)

		goto failed;



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

	i = pcmcia_enable_device(link);

	if (i != 0)

		goto failed;

CRA Git | Maintained and supported by SUSTech CRA and CCSE