mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
mei: bus: use mei_cl_bus_ prefix consistently
Use mei_cl_bus_ for internal bus function consistently. Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d49dc5e76f
commit
ae48d74dfc
3 changed files with 17 additions and 16 deletions
|
@ -285,11 +285,11 @@ static struct mei_fixup {
|
|||
};
|
||||
|
||||
/**
|
||||
* mei_cl_dev_fixup - run fixup handlers
|
||||
* mei_cldev_fixup - run fixup handlers
|
||||
*
|
||||
* @cldev: me client device
|
||||
*/
|
||||
void mei_cl_dev_fixup(struct mei_cl_device *cldev)
|
||||
void mei_cl_bus_dev_fixup(struct mei_cl_device *cldev)
|
||||
{
|
||||
struct mei_fixup *f;
|
||||
const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
|
||||
|
|
|
@ -725,7 +725,7 @@ static void mei_dev_bus_put(struct mei_device *bus)
|
|||
put_device(bus->dev);
|
||||
}
|
||||
|
||||
static void mei_cl_dev_release(struct device *dev)
|
||||
static void mei_cl_bus_dev_release(struct device *dev)
|
||||
{
|
||||
struct mei_cl_device *cldev = to_mei_cl_device(dev);
|
||||
|
||||
|
@ -738,19 +738,19 @@ static void mei_cl_dev_release(struct device *dev)
|
|||
}
|
||||
|
||||
static struct device_type mei_cl_device_type = {
|
||||
.release = mei_cl_dev_release,
|
||||
.release = mei_cl_bus_dev_release,
|
||||
};
|
||||
|
||||
/**
|
||||
* mei_cl_dev_alloc - initialize and allocate mei client device
|
||||
* mei_cl_bus_dev_alloc - initialize and allocate mei client device
|
||||
*
|
||||
* @bus: mei device
|
||||
* @me_cl: me client
|
||||
*
|
||||
* Return: allocated device structur or NULL on allocation failure
|
||||
*/
|
||||
static struct mei_cl_device *mei_cl_dev_alloc(struct mei_device *bus,
|
||||
struct mei_me_client *me_cl)
|
||||
static struct mei_cl_device *mei_cl_bus_dev_alloc(struct mei_device *bus,
|
||||
struct mei_me_client *me_cl)
|
||||
{
|
||||
struct mei_cl_device *cldev;
|
||||
|
||||
|
@ -779,11 +779,11 @@ static struct mei_cl_device *mei_cl_dev_alloc(struct mei_device *bus,
|
|||
*
|
||||
* Return: true if the device is eligible for enumeration
|
||||
*/
|
||||
static bool mei_cl_dev_setup(struct mei_device *bus,
|
||||
struct mei_cl_device *cldev)
|
||||
static bool mei_cl_bus_dev_setup(struct mei_device *bus,
|
||||
struct mei_cl_device *cldev)
|
||||
{
|
||||
cldev->do_match = 1;
|
||||
mei_cl_dev_fixup(cldev);
|
||||
mei_cl_bus_dev_fixup(cldev);
|
||||
|
||||
if (cldev->do_match)
|
||||
dev_set_name(&cldev->dev, "mei:%s:%pUl:%02X",
|
||||
|
@ -872,13 +872,14 @@ void mei_cl_bus_remove_devices(struct mei_device *bus)
|
|||
|
||||
|
||||
/**
|
||||
* mei_cl_dev_init - allocate and initializes an mei client devices
|
||||
* mei_cl_bus_dev_init - allocate and initializes an mei client devices
|
||||
* based on me client
|
||||
*
|
||||
* @bus: mei device
|
||||
* @me_cl: me client
|
||||
*/
|
||||
static void mei_cl_dev_init(struct mei_device *bus, struct mei_me_client *me_cl)
|
||||
static void mei_cl_bus_dev_init(struct mei_device *bus,
|
||||
struct mei_me_client *me_cl)
|
||||
{
|
||||
struct mei_cl_device *cldev;
|
||||
|
||||
|
@ -887,7 +888,7 @@ static void mei_cl_dev_init(struct mei_device *bus, struct mei_me_client *me_cl)
|
|||
if (me_cl->bus_added)
|
||||
return;
|
||||
|
||||
cldev = mei_cl_dev_alloc(bus, me_cl);
|
||||
cldev = mei_cl_bus_dev_alloc(bus, me_cl);
|
||||
if (!cldev)
|
||||
return;
|
||||
|
||||
|
@ -911,7 +912,7 @@ void mei_cl_bus_rescan(struct mei_device *bus)
|
|||
|
||||
down_read(&bus->me_clients_rwsem);
|
||||
list_for_each_entry(me_cl, &bus->me_clients, list)
|
||||
mei_cl_dev_init(bus, me_cl);
|
||||
mei_cl_bus_dev_init(bus, me_cl);
|
||||
up_read(&bus->me_clients_rwsem);
|
||||
|
||||
mutex_lock(&bus->cl_bus_lock);
|
||||
|
@ -925,7 +926,7 @@ void mei_cl_bus_rescan(struct mei_device *bus)
|
|||
if (cldev->is_added)
|
||||
continue;
|
||||
|
||||
if (mei_cl_dev_setup(bus, cldev))
|
||||
if (mei_cl_bus_dev_setup(bus, cldev))
|
||||
mei_cl_bus_dev_add(cldev);
|
||||
else {
|
||||
list_del_init(&cldev->bus_list);
|
||||
|
|
|
@ -340,7 +340,7 @@ struct mei_hw_ops {
|
|||
|
||||
/* MEI bus API*/
|
||||
void mei_cl_bus_rescan(struct mei_device *bus);
|
||||
void mei_cl_dev_fixup(struct mei_cl_device *dev);
|
||||
void mei_cl_bus_dev_fixup(struct mei_cl_device *dev);
|
||||
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);
|
||||
|
|
Loading…
Reference in a new issue