diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-23 15:39:47 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-23 15:39:47 +0100 |
| commit | 83f3a44d969161d569712926dbe5df75eb1493fa (patch) | |
| tree | 93adfc547c29700716dbfa8fc70d40a50c026655 /drivers/gpu | |
| parent | 868aa6daa6d714648dfbe126e1d6bc692b2d06dc (diff) | |
| parent | 3fadfb9362cf1b7d0a775f406f011d78800d6054 (diff) | |
| download | linux-next-83f3a44d969161d569712926dbe5df75eb1493fa.tar.gz linux-next-83f3a44d969161d569712926dbe5df75eb1493fa.zip | |
Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git
# Conflicts:
# include/linux/platform_device.h
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/xe/xe_i2c.c | 2 | ||||
| -rw-r--r-- | drivers/gpu/nova-core/driver.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/xe/xe_i2c.c b/drivers/gpu/drm/xe/xe_i2c.c index a26c38bb17a1..1812273d40da 100644 --- a/drivers/gpu/drm/xe/xe_i2c.c +++ b/drivers/gpu/drm/xe/xe_i2c.c @@ -126,7 +126,7 @@ static int xe_i2c_register_adapter(struct xe_i2c *i2c) } pdev->dev.parent = i2c->drm_dev; - pdev->dev.fwnode = fwnode; + platform_device_set_fwnode(pdev, fwnode); i2c->adapter_node = fwnode; i2c->pdev = pdev; diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver.rs index 5738d4ac521b..48380ac15f68 100644 --- a/drivers/gpu/nova-core/driver.rs +++ b/drivers/gpu/nova-core/driver.rs @@ -15,7 +15,7 @@ use kernel::{ Atomic, Relaxed, // }, - types::ForLt, + types::CovariantForLt, }; use crate::gpu::Gpu; @@ -29,7 +29,7 @@ pub(crate) struct NovaCore<'bound> { pub(crate) gpu: Gpu<'bound>, bar: pci::Bar<'bound, BAR0_SIZE>, #[allow(clippy::type_complexity)] - _reg: auxiliary::Registration<'bound, ForLt!(())>, + _reg: auxiliary::Registration<'bound, CovariantForLt!(())>, } pub(crate) struct NovaCoreDriver; |