diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2015-07-23 15:08:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-03 17:20:26 -0700 |
| commit | b37719c31f8448ba36abc218a96663b4a6c66eb6 (patch) | |
| tree | 917d0b0d1085253dc83e24bfacdb0a33b1732414 /drivers/misc/mei/mei_dev.h | |
| parent | 23253c31c6a7a3c5a437ec31830e2100484c0748 (diff) | |
mei: bus: fix drivers and devices names confusion
In the mei bus layer there is use of different variables
of driver and device types with no clear naming convention.
There are generic struct device and struct driver,
then mei_cl_{device, driver}, and finally mei_device which
in this context serves as a bus device.
The patch sets following naming convention:
the variables of type struct device remains dev
the variables of type struct driver remains drv
the variables of type struct mei_cl_device are now cldev
the variables of type struct mei_cl_driver are now cldrv
the variables of type struct mei_device are now bus, in bus
layer context
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/mei_dev.h')
| -rw-r--r-- | drivers/misc/mei/mei_dev.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h index 453f6a333b42..bc65fb42aea9 100644 --- a/drivers/misc/mei/mei_dev.h +++ b/drivers/misc/mei/mei_dev.h @@ -240,7 +240,7 @@ struct mei_cl_cb { * @rd_pending: pending read credits * @rd_completed: completed read * - * @device: device on the mei client bus + * @cldev: device on the mei client bus * @device_link: link to bus clients */ struct mei_cl { @@ -261,7 +261,7 @@ struct mei_cl { struct list_head rd_completed; /* MEI CL bus data */ - struct mei_cl_device *device; + struct mei_cl_device *cldev; struct list_head device_link; }; @@ -330,20 +330,20 @@ struct mei_hw_ops { /* MEI bus API*/ -struct mei_cl_device *mei_cl_add_device(struct mei_device *dev, +struct mei_cl_device *mei_cl_add_device(struct mei_device *bus, struct mei_me_client *me_cl, struct mei_cl *cl, char *name); -void mei_cl_remove_device(struct mei_cl_device *device); +void mei_cl_remove_device(struct mei_cl_device *cldev); ssize_t __mei_cl_send(struct mei_cl *cl, u8 *buf, size_t length, bool blocking); ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length); void mei_cl_bus_rx_event(struct mei_cl *cl); -void mei_cl_bus_remove_devices(struct mei_device *dev); +void mei_cl_bus_remove_devices(struct mei_device *bus); int mei_cl_bus_init(void); void mei_cl_bus_exit(void); -struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *dev, uuid_le uuid); +struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *bus, uuid_le uuid); /** * enum mei_pg_event - power gating transition events |