Module Name: src
Committed By: riastradh
Date: Tue Oct 27 13:16:33 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_i2c.c intel_pm.c
intel_sdvo.c
Log Message:
dev->dev, not &dev->pdev->dev.
Latter is a charlatan, soon to meet judgment for its sins.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.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/i915/intel_i2c.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.13 src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.14
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c:1.13 Thu Mar 5 21:13:48 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_i2c.c Tue Oct 27 13:16:33 2015
@@ -656,7 +656,7 @@ int intel_setup_gmbus(struct drm_device
"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;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.8
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.7 Sun Jul 26 15:30:36 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Tue Oct 27 13:16:33 2015
@@ -6020,7 +6020,7 @@ void intel_aux_display_runtime_put(struc
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_get(struct drm_i91
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_runtime_pm_put(struct drm_i91
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_init_runtime_pm(struct drm_i9
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;
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c:1.6 Sun Sep 7 23:03:11 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_sdvo.c Tue Oct 27 13:16:33 2015
@@ -2971,7 +2971,7 @@ intel_sdvo_init_ddc_proxy(struct intel_s
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;
