Module Name: src Committed By: riastradh Date: Sun Jul 17 14:11:18 UTC 2022
Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_drv.c src/sys/external/bsd/drm2/include/linux: device.h Log Message: drm: Ifdef out devm_* stuff rather than stub it out. Stub is not helpful, and this pollutes the symbol namespace. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/external/bsd/drm2/dist/drm/drm_drv.c cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/include/linux/device.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/external/bsd/drm2/dist/drm/drm_drv.c diff -u src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.22 src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.23 --- src/sys/external/bsd/drm2/dist/drm/drm_drv.c:1.22 Sun Dec 19 12:32:01 2021 +++ src/sys/external/bsd/drm2/dist/drm/drm_drv.c Sun Jul 17 14:11:18 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: drm_drv.c,v 1.22 2021/12/19 12:32:01 riastradh Exp $ */ +/* $NetBSD: drm_drv.c,v 1.23 2022/07/17 14:11:18 riastradh Exp $ */ /* * Created: Fri Jan 19 10:48:35 2001 by fa...@acm.org @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.22 2021/12/19 12:32:01 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: drm_drv.c,v 1.23 2022/07/17 14:11:18 riastradh Exp $"); #include <linux/debugfs.h> #include <linux/fs.h> @@ -767,6 +767,8 @@ err_pswitch: } EXPORT_SYMBOL(drm_dev_init); +#ifndef __NetBSD__ + static void devm_drm_dev_init_release(void *data) { drm_dev_put(data); @@ -806,6 +808,8 @@ int devm_drm_dev_init(struct device *par } EXPORT_SYMBOL(devm_drm_dev_init); +#endif + /** * drm_dev_fini - Finalize a dead DRM device * @dev: DRM device Index: src/sys/external/bsd/drm2/include/linux/device.h diff -u src/sys/external/bsd/drm2/include/linux/device.h:1.15 src/sys/external/bsd/drm2/include/linux/device.h:1.16 --- src/sys/external/bsd/drm2/include/linux/device.h:1.15 Sun Dec 19 12:29:09 2021 +++ src/sys/external/bsd/drm2/include/linux/device.h Sun Jul 17 14:11:18 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: device.h,v 1.15 2021/12/19 12:29:09 riastradh Exp $ */ +/* $NetBSD: device.h,v 1.16 2022/07/17 14:11:18 riastradh Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -96,11 +96,4 @@ dev_pm_set_driver_flags(struct device *d { } -static inline int -devm_add_action(struct device *parent, void (*func)(void *), - void *data) -{ - panic("TODO"); -} - #endif /* _LINUX_DEVICE_H_ */