mirror of
https://github.com/torvalds/linux.git
synced 2026-09-22 12:44:03 +02:00
drm/xe/i2c: use device_create_managed_software_node()
This driver intentionally uses the fine-grained approach to creating platform devices. It assigns a software node as the primary firmware node of the device it creates. Ahead of improving the reference counting of platform device software nodes, switch to using device_create_managed_software_node(). This way, we create a dynamic software node whose life-time is tied to the device to which it's assigned. Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com> Link: https://patch.msgid.link/20260716-swnode-remove-on-dev-unreg-v8-3-5c2b8cc38c28@oss.qualcomm.com Signed-off-by: Danilo Krummrich <dakr@kernel.org>
This commit is contained in:
parent
1e0bd438b8
commit
0f485f8865
|
|
@ -93,13 +93,8 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
|
|||
{
|
||||
struct pci_dev *pci = to_pci_dev(i2c->drm_dev);
|
||||
struct platform_device *pdev;
|
||||
struct fwnode_handle *fwnode;
|
||||
int ret;
|
||||
|
||||
fwnode = fwnode_create_software_node(xe_i2c_adapter_properties, NULL);
|
||||
if (IS_ERR(fwnode))
|
||||
return PTR_ERR(fwnode);
|
||||
|
||||
/*
|
||||
* Not using platform_device_register_full() here because we don't have
|
||||
* a handle to the platform_device before it returns. xe_i2c_notifier()
|
||||
|
|
@ -107,10 +102,14 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
|
|||
* platform_device_register_full() is done.
|
||||
*/
|
||||
pdev = platform_device_alloc(adapter_name, pci_dev_id(pci));
|
||||
if (!pdev) {
|
||||
ret = -ENOMEM;
|
||||
goto err_fwnode_remove;
|
||||
}
|
||||
if (!pdev)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = device_create_managed_software_node(&pdev->dev,
|
||||
xe_i2c_adapter_properties,
|
||||
NULL);
|
||||
if (ret)
|
||||
goto err_pdev_put;
|
||||
|
||||
if (i2c->adapter_irq) {
|
||||
struct resource res;
|
||||
|
|
@ -123,8 +122,6 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
|
|||
}
|
||||
|
||||
pdev->dev.parent = i2c->drm_dev;
|
||||
platform_device_set_fwnode(pdev, fwnode);
|
||||
i2c->adapter_node = fwnode;
|
||||
i2c->pdev = pdev;
|
||||
|
||||
ret = platform_device_add(pdev);
|
||||
|
|
@ -135,8 +132,6 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
|
|||
|
||||
err_pdev_put:
|
||||
platform_device_put(pdev);
|
||||
err_fwnode_remove:
|
||||
fwnode_remove_software_node(fwnode);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -144,7 +139,6 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
|
|||
static void xe_i2c_unregister_adapter(struct xe_i2c *i2c)
|
||||
{
|
||||
platform_device_unregister(i2c->pdev);
|
||||
fwnode_remove_software_node(i2c->adapter_node);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@ struct xe_i2c_endpoint {
|
|||
};
|
||||
|
||||
struct xe_i2c {
|
||||
struct fwnode_handle *adapter_node;
|
||||
struct platform_device *pdev;
|
||||
struct i2c_adapter *adapter;
|
||||
struct i2c_client *client[XE_I2C_MAX_CLIENTS];
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user