Module Name: src
Committed By: riastradh
Date: Mon Aug 27 07:46:38 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon: radeon_i2c.c
Log Message:
mutex init/destroy
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
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/radeon/radeon_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c:1.4 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c:1.4 Mon Aug 27 04:58:36 2018
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c Mon Aug 27 07:46:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: radeon_i2c.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $ */
+/* $NetBSD: radeon_i2c.c,v 1.5 2018/08/27 07:46:38 riastradh Exp $ */
/*
* Copyright 2007-8 Advanced Micro Devices, Inc.
@@ -26,7 +26,7 @@
* Alex Deucher
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: radeon_i2c.c,v 1.4 2018/08/27 04:58:36 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: radeon_i2c.c,v 1.5 2018/08/27 07:46:38 riastradh Exp $");
#include <linux/export.h>
#include <linux/module.h>
@@ -933,7 +933,11 @@ struct radeon_i2c_chan *radeon_i2c_creat
i2c->adapter.dev.parent = dev->dev;
i2c->dev = dev;
i2c_set_adapdata(&i2c->adapter, i2c);
+#ifdef __NetBSD__
+ linux_mutex_init(&i2c->mutex);
+#else
mutex_init(&i2c->mutex);
+#endif
if (rec->mm_i2c ||
(rec->hw_capable &&
radeon_hw_i2c &&
@@ -983,6 +987,11 @@ struct radeon_i2c_chan *radeon_i2c_creat
return i2c;
out_free:
+#ifdef __NetBSD__
+ linux_mutex_destroy(&i2c->mutex);
+#else
+ mutex_destroy(&i2c->mutex);
+#endif
kfree(i2c);
return NULL;
@@ -995,6 +1004,11 @@ void radeon_i2c_destroy(struct radeon_i2
i2c_del_adapter(&i2c->adapter);
if (i2c->has_aux)
drm_dp_aux_unregister(&i2c->aux);
+#ifdef __NetBSD__
+ linux_mutex_destroy(&i2c->mutex);
+#else
+ mutex_destroy(&i2c->mutex);
+#endif
kfree(i2c);
}
