Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-28 23:21:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

mei: bus: revamp probe and remove functions

Browse Source 
Instead of generating device id on the fly during probing we
find the matching id entry on the device id table.
Get bus the module reference counter so it cannot
be unloaded after the driver has bounded to the client
device

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 2015-07-23 15:08:40 +03:00 committed by Greg Kroah-Hartman
parent 688a9cce0c
commit feb8cd0fe7
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,30 +446,49 @@ static int mei_cl_device_match(struct device *dev, struct device_driver *drv)
return 0;
}
/**
* mei_cl_device_probe - bus probe function
*
* @dev: device
*
* Return: 0 on success; < 0 otherwise
*/
static int mei_cl_device_probe(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
struct mei_cl_device *cldev;
struct mei_cl_driver *cldrv;
struct mei_cl_device_id id;
const struct mei_cl_device_id *id;
cldev = to_mei_cl_device(dev);
cldrv = to_mei_cl_driver(dev->driver);
if (!cldev)
return 0;
cldrv = to_mei_cl_driver(dev->driver);
if (!cldrv || !cldrv->probe)
return -ENODEV;
dev_dbg(dev, "Device probe\n");
id = mei_cl_device_find(cldev, cldrv);
if (!id)
return -ENODEV;
strlcpy(id.name, cldev->name, sizeof(id.name));
__module_get(THIS_MODULE);
return cldrv->probe(cldev, &id);
return cldrv->probe(cldev, id);
}
/**
* mei_cl_device_remove - remove device from the bus
*
* @dev: device
*
* Return: 0 on success; < 0 otherwise
*/
static int mei_cl_device_remove(struct device *dev)
{
struct mei_cl_device *cldev = to_mei_cl_device(dev);
struct mei_cl_driver *cldrv;
int ret = 0;
if (!cldev || !dev->driver)
return 0;
@ -480,13 +499,13 @@ static int mei_cl_device_remove(struct device *dev)
}
cldrv = to_mei_cl_driver(dev->driver);
if (!cldrv->remove) {
dev->driver = NULL;
if (cldrv->remove)
ret = cldrv->remove(cldev);
return 0;
}
module_put(THIS_MODULE);
dev->driver = NULL;
return ret;
return cldrv->remove(cldev);
}
static ssize_t name_show(struct device *dev, struct device_attribute *a,