diff options
Diffstat (limited to 'drivers/misc/mei/mei_dev.h')
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 5c7e990e2f22..0b0d6135543b 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h | |||
| @@ -227,7 +227,6 @@ struct mei_cl { | |||
| 227 | 227 | ||
| 228 | /** struct mei_hw_ops | 228 | /** struct mei_hw_ops |
| 229 | * | 229 | * |
| 230 | * @fw_status - read FW status from PCI config space | ||
| 231 | * @host_is_ready - query for host readiness | 230 | * @host_is_ready - query for host readiness |
| 232 | 231 | ||
| 233 | * @hw_is_ready - query if hw is ready | 232 | * @hw_is_ready - query if hw is ready |
| @@ -255,8 +254,6 @@ struct mei_cl { | |||
| 255 | */ | 254 | */ |
| 256 | struct mei_hw_ops { | 255 | struct mei_hw_ops { |
| 257 | 256 | ||
| 258 | int (*fw_status)(struct mei_device *dev, | ||
| 259 | struct mei_fw_status *fw_status); | ||
| 260 | bool (*host_is_ready)(struct mei_device *dev); | 257 | bool (*host_is_ready)(struct mei_device *dev); |
| 261 | 258 | ||
| 262 | bool (*hw_is_ready)(struct mei_device *dev); | 259 | bool (*hw_is_ready)(struct mei_device *dev); |
| @@ -400,6 +397,10 @@ struct mei_cfg { | |||
| 400 | /** | 397 | /** |
| 401 | * struct mei_device - MEI private device struct | 398 | * struct mei_device - MEI private device struct |
| 402 | 399 | ||
| 400 | * @pdev - pointer to pci device struct | ||
| 401 | * @cdev - character device | ||
| 402 | * @minor - minor number allocated for device | ||
| 403 | * | ||
| 403 | * @reset_count - limits the number of consecutive resets | 404 | * @reset_count - limits the number of consecutive resets |
| 404 | * @hbm_state - state of host bus message protocol | 405 | * @hbm_state - state of host bus message protocol |
| 405 | * @pg_event - power gating event | 406 | * @pg_event - power gating event |
| @@ -412,6 +413,9 @@ struct mei_cfg { | |||
| 412 | */ | 413 | */ |
| 413 | struct mei_device { | 414 | struct mei_device { |
| 414 | struct pci_dev *pdev; /* pointer to pci device struct */ | 415 | struct pci_dev *pdev; /* pointer to pci device struct */ |
| 416 | struct cdev cdev; | ||
| 417 | int minor; | ||
| 418 | |||
| 415 | /* | 419 | /* |
| 416 | * lists of queues | 420 | * lists of queues |
| 417 | */ | 421 | */ |
| @@ -741,7 +745,7 @@ static inline int mei_dbgfs_register(struct mei_device *dev, const char *name) | |||
| 741 | static inline void mei_dbgfs_deregister(struct mei_device *dev) {} | 745 | static inline void mei_dbgfs_deregister(struct mei_device *dev) {} |
| 742 | #endif /* CONFIG_DEBUG_FS */ | 746 | #endif /* CONFIG_DEBUG_FS */ |
| 743 | 747 | ||
| 744 | int mei_register(struct mei_device *dev); | 748 | int mei_register(struct mei_device *dev, struct device *parent); |
| 745 | void mei_deregister(struct mei_device *dev); | 749 | void mei_deregister(struct mei_device *dev); |
| 746 | 750 | ||
| 747 | #define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d internal=%1d comp=%1d" | 751 | #define MEI_HDR_FMT "hdr:host=%02d me=%02d len=%d internal=%1d comp=%1d" |
