[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 dev->dev, not &dev->pdev...

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

details:   https://anonhg.NetBSD.org/src/rev/cc2c4aca4890
branches:  trunk
changeset: 341230:cc2c4aca4890
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Oct 27 13:16:33 2015 +0000

description:
dev->dev, not &dev->pdev->dev.

Latter is a charlatan, soon to meet judgment for its sins.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c  |  2 +-
 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c   |  8 ++++----
 sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diffs (63 lines):

diff -r ab8f9967fbe3 -r cc2c4aca4890 sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c   Tue Oct 27 13:13:47 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c   Tue Oct 27 13:16:33 2015 +0000
@@ -656,7 +656,7 @@
                         "i915 gmbus %s",
                         gmbus_ports[i].name);
 
-               bus->adapter.dev.parent = &dev->pdev->dev;
+               bus->adapter.dev.parent = dev->dev;
                bus->dev_priv = dev_priv;
 
                bus->adapter.algo = &gmbus_algorithm;
diff -r ab8f9967fbe3 -r cc2c4aca4890 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Tue Oct 27 13:13:47 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Tue Oct 27 13:16:33 2015 +0000
@@ -6020,7 +6020,7 @@
 void intel_runtime_pm_get(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
-       struct device *device = &dev->pdev->dev;
+       struct device *device = dev->dev;
 
        if (!HAS_RUNTIME_PM(dev))
                return;
@@ -6032,7 +6032,7 @@
 void intel_runtime_pm_put(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
-       struct device *device = &dev->pdev->dev;
+       struct device *device = dev->dev;
 
        if (!HAS_RUNTIME_PM(dev))
                return;
@@ -6044,7 +6044,7 @@
 void intel_init_runtime_pm(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
-       struct device *device = &dev->pdev->dev;
+       struct device *device = dev->dev;
 
        if (!HAS_RUNTIME_PM(dev))
                return;
@@ -6061,7 +6061,7 @@
 void intel_fini_runtime_pm(struct drm_i915_private *dev_priv)
 {
        struct drm_device *dev = dev_priv->dev;
-       struct device *device = &dev->pdev->dev;
+       struct device *device = dev->dev;
 
        if (!HAS_RUNTIME_PM(dev))
                return;
diff -r ab8f9967fbe3 -r cc2c4aca4890 sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c  Tue Oct 27 13:13:47 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c  Tue Oct 27 13:16:33 2015 +0000
@@ -2971,7 +2971,7 @@
        sdvo->ddc.owner = THIS_MODULE;
        sdvo->ddc.class = I2C_CLASS_DDC;
        snprintf(sdvo->ddc.name, I2C_NAME_SIZE, "SDVO DDC proxy");
-       sdvo->ddc.dev.parent = &dev->pdev->dev;
+       sdvo->ddc.dev.parent = dev->dev;
        sdvo->ddc.algo_data = sdvo;
        sdvo->ddc.algo = &intel_sdvo_ddc_proxy;