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

Commit 5fa9167a authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

pcmcia: rework the irq_req_t typedef 



Most of the irq_req_t typedef'd struct can be re-worked quite
easily:

(1) IRQInfo2 was unused in any case, so drop it.

(2) IRQInfo1 was used write-only, so drop it.

(3) Instance (private data to be passed to the IRQ handler):
	Most PCMCIA drivers using pcmcia_request_irq() to actually
	register an IRQ handler set the "dev_id" to the same pointer
	as the "priv" pointer in struct pcmcia_device. Modify the two
	exceptions (ipwireless, ibmtr_cs) to also work this waym and
	set the IRQ handler's "dev_id" to p_dev->priv unconditionally.

(4) Handler is to be of type irq_handler_t.

(5) Handler != NULL already tells whether an IRQ handler is present.
	Therefore, we do not need the IRQ_HANDLER_PRESENT flag in
	irq_req_t.Attributes.

CC: netdev@vger.kernel.org
CC: linux-bluetooth@vger.kernel.org
CC: linux-ide@vger.kernel.org
CC: linux-wireless@vger.kernel.org
CC: linux-scsi@vger.kernel.org
CC: alsa-devel@alsa-project.org
CC: Jaroslav Kysela <perex@perex.cz>
CC: Jiri Kosina <jkosina@suse.cz>
CC: Karsten Keil <isdn@linux-pingi.de>
for the Bluetooth parts: Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent dd2e5a15

drivers/ata/pata_pcmcia.c

+0 −1
Original line number Diff line number Diff line
@@ -268,7 +268,6 @@ static int pcmcia_init_one(struct pcmcia_device *pdev) 
	pdev->io.Attributes2 = IO_DATA_PATH_WIDTH_8;

	pdev->io.IOAddrLines = 3;

	pdev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;

	pdev->irq.IRQInfo1 = IRQ_LEVEL_ID;

	pdev->conf.Attributes = CONF_ENABLE_IRQ;

	pdev->conf.IntType = INT_MEMORY_AND_IO;

drivers/bluetooth/bluecard_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -867,11 +867,9 @@ static int bluecard_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;



	link->irq.Handler = bluecard_interrupt;

	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;

drivers/bluetooth/bt3c_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -659,11 +659,9 @@ static int bt3c_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;



	link->irq.Handler = bt3c_interrupt;

	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;

drivers/bluetooth/btuart_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -588,11 +588,9 @@ static int btuart_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;



	link->irq.Handler = btuart_interrupt;

	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;

drivers/bluetooth/dtl1_cs.c

+1 −3
Original line number Diff line number Diff line
@@ -573,11 +573,9 @@ static int dtl1_probe(struct pcmcia_device *link) 


	link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;

	link->io.NumPorts1 = 8;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_HANDLE_PRESENT;

	link->irq.IRQInfo1 = IRQ_LEVEL_ID;

	link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;



	link->irq.Handler = dtl1_interrupt;

	link->irq.Instance = info;



	link->conf.Attributes = CONF_ENABLE_IRQ;

	link->conf.IntType = INT_MEMORY_AND_IO;