mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
[PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present
Instead of the DEV_OK macro, drivers should use pcmcia_dev_present(). Signed-off-by: Dominik Brodowski <[email protected]>
This commit is contained in:
parent
e2d4096365
commit
9940ec3617
21 changed files with 59 additions and 36 deletions
|
|
@ -390,6 +390,7 @@ int pcmcia_eject_card(struct pcmcia_socket *skt);
|
|||
int pcmcia_insert_card(struct pcmcia_socket *skt);
|
||||
int pccard_reset_card(struct pcmcia_socket *skt);
|
||||
|
||||
struct pcmcia_device * pcmcia_dev_present(struct pcmcia_device *p_dev);
|
||||
void pcmcia_disable_device(struct pcmcia_device *p_dev);
|
||||
|
||||
struct pcmcia_socket * pcmcia_get_socket(struct pcmcia_socket *skt);
|
||||
|
|
|
|||
|
|
@ -104,12 +104,6 @@ typedef struct dev_node_t {
|
|||
struct dev_node_t *next;
|
||||
} dev_node_t;
|
||||
|
||||
#define pcmcia_dev_present(p_dev) \
|
||||
(p_dev->socket->pcmcia_state.present)
|
||||
|
||||
#define DEV_OK(l) \
|
||||
((l) && (!l->suspended) && pcmcia_dev_present(l))
|
||||
|
||||
|
||||
struct pcmcia_socket;
|
||||
struct config_t;
|
||||
|
|
@ -155,8 +149,10 @@ struct pcmcia_device {
|
|||
config_req_t conf;
|
||||
window_handle_t win;
|
||||
|
||||
/* Is the device suspended? */
|
||||
/* Is the device suspended, or in the process of
|
||||
* being removed? */
|
||||
u16 suspended:1;
|
||||
u16 _removed:1;
|
||||
|
||||
/* Flags whether io, irq, win configurations were
|
||||
* requested, and whether the configuration is "locked" */
|
||||
|
|
@ -174,7 +170,7 @@ struct pcmcia_device {
|
|||
u16 has_card_id:1;
|
||||
u16 has_func_id:1;
|
||||
|
||||
u16 reserved:4;
|
||||
u16 reserved:3;
|
||||
|
||||
u8 func_id;
|
||||
u16 manf_id;
|
||||
|
|
|
|||
Loading…
Reference in a new issue