github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe/i2c: use device_create_managed_software_node()

Browse Source 
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:
Bartosz Golaszewski 2026-07-16 14:31:38 +02:00 committed by Danilo Krummrich
parent 1e0bd438b8
commit 0f485f8865
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/gpu/drm/xe/xe_i2c.c
View File

@ -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 pci_dev *pci = to_pci_dev(i2c->drm_dev);
struct platform_device *pdev; struct platform_device *pdev;
struct fwnode_handle *fwnode;
int ret; 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 * Not using platform_device_register_full() here because we don't have
* a handle to the platform_device before it returns. xe_i2c_notifier() * 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. * platform_device_register_full() is done.
*/ */
pdev = platform_device_alloc(adapter_name, pci_dev_id(pci)); pdev = platform_device_alloc(adapter_name, pci_dev_id(pci));
if (!pdev) { if (!pdev)
ret = -ENOMEM; return -ENOMEM;
goto err_fwnode_remove;
} ret = device_create_managed_software_node(&pdev->dev,
xe_i2c_adapter_properties,
NULL);
if (ret)
goto err_pdev_put;
if (i2c->adapter_irq) { if (i2c->adapter_irq) {
struct resource res; struct resource res;
@ -123,8 +122,6 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
} }
pdev->dev.parent = i2c->drm_dev; pdev->dev.parent = i2c->drm_dev;
platform_device_set_fwnode(pdev, fwnode);
i2c->adapter_node = fwnode;
i2c->pdev = pdev; i2c->pdev = pdev;
ret = platform_device_add(pdev); ret = platform_device_add(pdev);
@ -135,8 +132,6 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c)
err_pdev_put: err_pdev_put:
platform_device_put(pdev); platform_device_put(pdev);
err_fwnode_remove:
fwnode_remove_software_node(fwnode);
return ret; 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) static void xe_i2c_unregister_adapter(struct xe_i2c *i2c)
{ {
platform_device_unregister(i2c->pdev); platform_device_unregister(i2c->pdev);
fwnode_remove_software_node(i2c->adapter_node);
} }
/** /**

1
drivers/gpu/drm/xe/xe_i2c.h
View File

@ -30,7 +30,6 @@ struct xe_i2c_endpoint {
}; };
struct xe_i2c { struct xe_i2c {
struct fwnode_handle *adapter_node;
struct platform_device *pdev; struct platform_device *pdev;
struct i2c_adapter *adapter; struct i2c_adapter *adapter;
struct i2c_client *client[XE_I2C_MAX_CLIENTS]; struct i2c_client *client[XE_I2C_MAX_CLIENTS];