Commit feb8cd0f authored by Tomas Winkler's avatar Tomas Winkler Committed by Greg Kroah-Hartman
Browse files

mei: bus: revamp probe and remove functions 



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: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 688a9cce

drivers/misc/mei/bus.c

+30 −11
Original line number Original line Diff line number Diff line
@@ -446,30 +446,49 @@ static int mei_cl_device_match(struct device *dev, struct device_driver *drv) 
	return 0;

	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)

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_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)

	if (!cldev)

		return 0;

		return 0;





	cldrv = to_mei_cl_driver(dev->driver);

	if (!cldrv || !cldrv->probe)

	if (!cldrv || !cldrv->probe)

		return -ENODEV;

		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)

static int mei_cl_device_remove(struct device *dev)

{

{

	struct mei_cl_device *cldev = to_mei_cl_device(dev);

	struct mei_cl_device *cldev = to_mei_cl_device(dev);

	struct mei_cl_driver *cldrv;

	struct mei_cl_driver *cldrv;

	int ret = 0;





	if (!cldev || !dev->driver)

	if (!cldev || !dev->driver)

		return 0;

		return 0;
@@ -480,13 +499,13 @@ static int mei_cl_device_remove(struct device *dev) 
	}

	}





	cldrv = to_mei_cl_driver(dev->driver);

	cldrv = to_mei_cl_driver(dev->driver);

	if (!cldrv->remove) {

	if (cldrv->remove)

		dev->driver = NULL;

		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,

static ssize_t name_show(struct device *dev, struct device_attribute *a,

CRA Git | Maintained and supported by SUSTech CRA and CCSE