Use an aggregate driver instead of component ops so that we can get
proper driver probe ordering of the aggregate device with respect to all
the component devices that make up the aggregate device.
Cc: Vitaly Lubart <vitaly.lubart@xxxxxxxxx>
Cc: Tomas Winkler <tomas.winkler@xxxxxxxxx>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@xxxxxxxxx>
Cc: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Cc: Daniel Vetter <daniel.vetter@xxxxxxxx>
Cc: "Rafael J. Wysocki" <rafael@xxxxxxxxxx>
Cc: Rob Clark <robdclark@xxxxxxxxx>
Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Cc: Saravana Kannan <saravanak@xxxxxxxxxx>
Signed-off-by: Stephen Boyd <swboyd@xxxxxxxxxxxx>
---
drivers/misc/mei/pxp/mei_pxp.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/misc/mei/pxp/mei_pxp.c b/drivers/misc/mei/pxp/mei_pxp.c
index f7380d387bab..50688a6fb1a9 100644
--- a/drivers/misc/mei/pxp/mei_pxp.c
+++ b/drivers/misc/mei/pxp/mei_pxp.c
@@ -83,8 +83,9 @@ static const struct i915_pxp_component_ops mei_pxp_ops = {
.recv = mei_pxp_receive_message,
};
-static int mei_component_master_bind(struct device *dev)
+static int mei_aggregate_bind(struct aggregate_device *adev)
{
+ struct device *dev = adev->parent;
struct mei_cl_device *cldev = to_mei_cl_device(dev);
struct i915_pxp_component *comp_master = mei_cldev_get_drvdata(cldev);
int ret;
@@ -98,17 +99,22 @@ static int mei_component_master_bind(struct device *dev)
return 0;
}
-static void mei_component_master_unbind(struct device *dev)
+static void mei_aggregate_unbind(struct aggregate_device *adev)
{
+ struct device *dev = adev->parent;
struct mei_cl_device *cldev = to_mei_cl_device(dev);
struct i915_pxp_component *comp_master = mei_cldev_get_drvdata(cldev);
component_unbind_all(dev, comp_master);
}
-static const struct component_master_ops mei_component_master_ops = {
- .bind = mei_component_master_bind,
- .unbind = mei_component_master_unbind,
+static struct aggregate_driver mei_aggregate_driver = {
+ .probe = mei_aggregate_bind,
+ .remove = mei_aggregate_unbind,
+ .driver = {
+ .name = "mei",
+ .owner = THIS_MODULE,
+ }
};
/**
@@ -173,9 +179,7 @@ static int mei_pxp_probe(struct mei_cl_device *cldev,
}
mei_cldev_set_drvdata(cldev, comp_master);
- ret = component_master_add_with_match(&cldev->dev,
- &mei_component_master_ops,
- master_match);
+ ret = component_aggregate_register(&cldev->dev, &mei_aggregate_driver, master_match);
if (ret < 0) {
dev_err(&cldev->dev, "Master comp add failed %d\n", ret);
goto err_exit;
@@ -196,7 +200,7 @@ static void mei_pxp_remove(struct mei_cl_device *cldev)
struct i915_pxp_component *comp_master = mei_cldev_get_drvdata(cldev);
int ret;
- component_master_del(&cldev->dev, &mei_component_master_ops);
+ component_aggregate_unregister(&cldev->dev, &mei_aggregate_driver);
kfree(comp_master);
mei_cldev_set_drvdata(cldev, NULL);
--
https://chromeos.dev
