mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
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: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: [email protected] CC: Jaroslav Kysela <[email protected]> CC: Jiri Kosina <[email protected]> CC: Karsten Keil <[email protected]> for the Bluetooth parts: Acked-by: Marcel Holtmann <[email protected]> Signed-off-by: Dominik Brodowski <[email protected]>
This commit is contained in:
parent
dd2e5a1565
commit
5fa9167a1b
54 changed files with 59 additions and 136 deletions
|
|
@ -15,6 +15,10 @@
|
|||
#ifndef _LINUX_CS_H
|
||||
#define _LINUX_CS_H
|
||||
|
||||
#ifdef __KERNEL__
|
||||
#include <linux/interrupt.h>
|
||||
#endif
|
||||
|
||||
/* For AccessConfigurationRegister */
|
||||
typedef struct conf_reg_t {
|
||||
u_char Function;
|
||||
|
|
@ -111,11 +115,9 @@ typedef struct io_req_t {
|
|||
|
||||
/* For RequestIRQ and ReleaseIRQ */
|
||||
typedef struct irq_req_t {
|
||||
u_int Attributes;
|
||||
u_int AssignedIRQ;
|
||||
u_int IRQInfo1, IRQInfo2; /* IRQInfo2 is ignored */
|
||||
void *Handler;
|
||||
void *Instance;
|
||||
u_int Attributes;
|
||||
u_int AssignedIRQ;
|
||||
irq_handler_t Handler;
|
||||
} irq_req_t;
|
||||
|
||||
/* Attributes for RequestIRQ and ReleaseIRQ */
|
||||
|
|
@ -125,7 +127,7 @@ typedef struct irq_req_t {
|
|||
#define IRQ_TYPE_DYNAMIC_SHARING 0x02
|
||||
#define IRQ_FORCED_PULSE 0x04
|
||||
#define IRQ_FIRST_SHARED 0x08
|
||||
#define IRQ_HANDLE_PRESENT 0x10
|
||||
//#define IRQ_HANDLE_PRESENT 0x10
|
||||
#define IRQ_PULSE_ALLOCATED 0x100
|
||||
|
||||
/* Bits in IRQInfo1 field */
|
||||
|
|
|
|||
Loading…
Reference in a new issue