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

Commit 37979e15 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: simplify IntType 



IntType was only set to INT_MEMORY (driver pcmciamtd) or INT_MEMORY_AND_IO
(all other drivers). As this flags seems to relate to ioport access, make
it conditional to the driver having requested IO port access. There are two
drivers which do not request IO ports, but did set INT_MEMORY_AND_IO:
ray_cs and b43. For those, we consistently only set INT_MEMORY in future.

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 fc301101

drivers/ata/pata_pcmcia.c

+0 −1
Original line number Diff line number Diff line
@@ -250,7 +250,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	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->conf.IntType = INT_MEMORY_AND_IO;



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

	   vendor quirks */

drivers/bluetooth/bluecard_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -866,7 +866,6 @@ static int bluecard_probe(struct pcmcia_device *link) 
	link->priv = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;



	return bluecard_config(link);

}

drivers/bluetooth/bt3c_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -661,7 +661,6 @@ static int bt3c_probe(struct pcmcia_device *link) 
	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;



	return bt3c_config(link);

}

drivers/bluetooth/btuart_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -590,7 +590,6 @@ static int btuart_probe(struct pcmcia_device *link) 
	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;



	return btuart_config(link);

}

drivers/bluetooth/dtl1_cs.c

+0 −1
Original line number Diff line number Diff line
@@ -576,7 +576,6 @@ static int dtl1_probe(struct pcmcia_device *link) 
	link->resource[0]->end = 8;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;



	return dtl1_config(link);

}