OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mei: make module referencing local to the bus.c 

Module reference counting is relevant only to the
mei client devices. Make the implementation clean
and move it to bus.c

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tomas Winkler 2018-02-25 20:07:04 +02:00 committed by Greg Kroah-Hartman
parent bb479444d1
commit 257355a44b
3 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
drivers/misc/mei/bus.c
View File

@ -449,6 +449,29 @@ bool mei_cldev_enabled(struct mei_cl_device *cldev)
}
EXPORT_SYMBOL_GPL(mei_cldev_enabled);
/**
* mei_cl_bus_module_get - acquire module of the underlying
* hw driver.
*
* @cldev: mei client device
*
* Return: true on success; false if the module was removed.
*/
static bool mei_cl_bus_module_get(struct mei_cl_device *cldev)
{
return try_module_get(cldev->bus->dev->driver->owner);
}
/**
* mei_cl_bus_module_put - release the underlying hw module.
*
* @cldev: mei client device
*/
static void mei_cl_bus_module_put(struct mei_cl_device *cldev)
{
module_put(cldev->bus->dev->driver->owner);
}
/**
* mei_cldev_enable - enable me client device
* create connection with me client
@ -487,9 +510,17 @@ int mei_cldev_enable(struct mei_cl_device *cldev)
goto out;
}
if (!mei_cl_bus_module_get(cldev)) {
dev_err(&cldev->dev, "get hw module failed");
ret = -ENODEV;
goto out;
}
ret = mei_cl_connect(cl, cldev->me_cl, NULL);
if (ret < 0)
if (ret < 0) {
dev_err(&cldev->dev, "cannot connect\n");
mei_cl_bus_module_put(cldev);
}
out:
mutex_unlock(&bus->device_lock);
@ -553,6 +584,8 @@ int mei_cldev_disable(struct mei_cl_device *cldev)
dev_err(bus->dev, "Could not disconnect from the ME client\n");
out:
mei_cl_bus_module_put(cldev);
/* Flush queues and remove any pending read */
mei_cl_flush_queues(cl, NULL);
mei_cl_unlink(cl);
@ -562,37 +595,6 @@ out:
}
EXPORT_SYMBOL_GPL(mei_cldev_disable);
/**
* mei_cl_bus_module_get - acquire module of the underlying
* hw module.
*
* @cl: host client
*
* Return: true on success; false if the module was removed.
*/
bool mei_cl_bus_module_get(struct mei_cl *cl)
{
struct mei_cl_device *cldev = cl->cldev;
if (!cldev)
return true;
return try_module_get(cldev->bus->dev->driver->owner);
}
/**
* mei_cl_bus_module_put - release the underlying hw module.
*
* @cl: host client
*/
void mei_cl_bus_module_put(struct mei_cl *cl)
{
struct mei_cl_device *cldev = cl->cldev;
if (cldev)
module_put(cldev->bus->dev->driver->owner);
}
/**
* mei_cl_device_find - find matching entry in the driver id table
*

5
drivers/misc/mei/client.c
View File

@ -765,8 +765,6 @@ static void mei_cl_set_disconnected(struct mei_cl *cl)
cl->tx_flow_ctrl_creds = 0;
cl->timer_count = 0;
mei_cl_bus_module_put(cl);
if (!cl->me_cl)
return;
@ -1076,9 +1074,6 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl,
dev = cl->dev;
if (!mei_cl_bus_module_get(cl))
return -ENODEV;
rets = mei_cl_set_connecting(cl, me_cl);
if (rets)
goto nortpm;

2
drivers/misc/mei/mei_dev.h
View File

@ -315,8 +315,6 @@ ssize_t __mei_cl_recv(struct mei_cl *cl, u8 *buf, size_t length,
bool mei_cl_bus_rx_event(struct mei_cl *cl);
bool mei_cl_bus_notify_event(struct mei_cl *cl);
void mei_cl_bus_remove_devices(struct mei_device *bus);
bool mei_cl_bus_module_get(struct mei_cl *cl);
void mei_cl_bus_module_put(struct mei_cl *cl);
int mei_cl_bus_init(void);
void mei_cl_bus_exit(void);