[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915/display ifdef out sysfs,...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c145dbe5c101
branches:  trunk
changeset: 1028689:c145dbe5c101
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:46:19 2021 +0000

description:
ifdef out sysfs, unused static function


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (57 lines):

diff -r 7df7735fce70 -r c145dbe5c101 sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c
--- a/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c  Sun Dec 19 11:46:11 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/display/intel_hdmi.c  Sun Dec 19 11:46:19 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: intel_hdmi.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $ */
+/*     $NetBSD: intel_hdmi.c,v 1.5 2021/12/19 11:46:19 riastradh Exp $ */
 
 /*
  * Copyright 2006 Dave Airlie <airlied%linux.ie@localhost>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.4 2021/12/19 11:45:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_hdmi.c,v 1.5 2021/12/19 11:46:19 riastradh Exp $");
 
 #include <linux/delay.h>
 #include <linux/hdmi.h>
@@ -2775,6 +2775,7 @@
        chv_phy_release_cl2_override(encoder);
 }
 
+#ifndef __NetBSD__
 static struct i2c_adapter *
 intel_hdmi_get_i2c_adapter(struct drm_connector *connector)
 {
@@ -2783,9 +2784,11 @@
 
        return intel_gmbus_get_adapter(dev_priv, intel_hdmi->ddc_bus);
 }
+#endif
 
 static void intel_hdmi_create_i2c_symlink(struct drm_connector *connector)
 {
+#ifndef __NetBSD__ /* XXX i915 hdmi sysfs */
        struct i2c_adapter *adapter = intel_hdmi_get_i2c_adapter(connector);
        struct kobject *i2c_kobj = &adapter->dev.kobj;
        struct kobject *connector_kobj = &connector->kdev->kobj;
@@ -2794,15 +2797,18 @@
        ret = sysfs_create_link(connector_kobj, i2c_kobj, i2c_kobj->name);
        if (ret)
                DRM_ERROR("Failed to create i2c symlink (%d)\n", ret);
+#endif
 }
 
 static void intel_hdmi_remove_i2c_symlink(struct drm_connector *connector)
 {
+#ifndef __NetBSD__ /* XXX i915 hdmi sysfs */
        struct i2c_adapter *adapter = intel_hdmi_get_i2c_adapter(connector);
        struct kobject *i2c_kobj = &adapter->dev.kobj;
        struct kobject *connector_kobj = &connector->kdev->kobj;
 
        sysfs_remove_link(connector_kobj, i2c_kobj->name);
+#endif
 }
 
 static int