Skip to content

Commit dcde56b

Browse files
committed
Fix mismerge due to devnode now taking a 'const *' device
This was a mismerge of a semantic conflict in my merge of the driver core updates, where commit ff62b8e ("driver core: make struct class.devnode() take a const *") changed the devnode function pointer type. In the meantime, the drm tree I merged earlier had introduced a new use of that in commit 8bf4889 ("drivers/accel: define kconfig and register a new major"). And of course this happens when I'm traveling with my laptop, and thus didn't do a full allmodconfig build between every pull and before pushing my work out. So I only noticed later as I was doing my full build. Brown-paper-bag-by: Linus Torvalds <[email protected]> Fixes: 71a7507 Merge tag 'driver-core-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core Signed-off-by: Linus Torvalds <[email protected]>
1 parent 71a7507 commit dcde56b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/accel/drm_accel.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ static struct device_type accel_sysfs_device_minor = {
2727
.name = "accel_minor"
2828
};
2929

30-
static char *accel_devnode(struct device *dev, umode_t *mode)
30+
static char *accel_devnode(const struct device *dev, umode_t *mode)
3131
{
3232
return kasprintf(GFP_KERNEL, "accel/%s", dev_name(dev));
3333
}

0 commit comments

Comments
 (0)