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

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

details:   https://anonhg.NetBSD.org/src/rev/ae082a4e29b2
branches:  trunk
changeset: 341231:ae082a4e29b2
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Tue Oct 27 13:18:21 2015 +0000

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

Latter is a mistake that is all my fault.  Oops.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c |  2 +-
 sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c     |  8 ++++----
 sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c     |  2 +-
 sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c     |  6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diffs (91 lines):

diff -r cc2c4aca4890 -r ae082a4e29b2 sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c    Tue Oct 27 13:16:33 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_display.c    Tue Oct 27 13:18:21 2015 +0000
@@ -1301,7 +1301,7 @@
 
        obj = drm_gem_object_lookup(dev, file_priv, mode_cmd->handles[0]);
        if (obj ==  NULL) {
-               dev_err(&dev->pdev->dev, "No GEM object associated to handle 0x%08X, "
+               dev_err(dev->dev, "No GEM object associated to handle 0x%08X, "
                        "can't create framebuffer\n", mode_cmd->handles[0]);
                return ERR_PTR(-ENOENT);
        }
diff -r cc2c4aca4890 -r ae082a4e29b2 sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c        Tue Oct 27 13:16:33 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_gem.c        Tue Oct 27 13:18:21 2015 +0000
@@ -446,7 +446,7 @@
        }
 
        if (args->offset < RADEON_VA_RESERVED_SIZE) {
-               dev_err(&dev->pdev->dev,
+               dev_err(dev->dev,
                        "offset 0x%lX is in reserved area 0x%X\n",
                        (unsigned long)args->offset,
                        RADEON_VA_RESERVED_SIZE);
@@ -460,13 +460,13 @@
         */
        invalid_flags = RADEON_VM_PAGE_VALID | RADEON_VM_PAGE_SYSTEM;
        if ((args->flags & invalid_flags)) {
-               dev_err(&dev->pdev->dev, "invalid flags 0x%08X vs 0x%08X\n",
+               dev_err(dev->dev, "invalid flags 0x%08X vs 0x%08X\n",
                        args->flags, invalid_flags);
                args->operation = RADEON_VA_RESULT_ERROR;
                return -EINVAL;
        }
        if (!(args->flags & RADEON_VM_PAGE_SNOOPED)) {
-               dev_err(&dev->pdev->dev, "only supported snooped mapping for now\n");
+               dev_err(dev->dev, "only supported snooped mapping for now\n");
                args->operation = RADEON_VA_RESULT_ERROR;
                return -EINVAL;
        }
@@ -476,7 +476,7 @@
        case RADEON_VA_UNMAP:
                break;
        default:
-               dev_err(&dev->pdev->dev, "unsupported operation %d\n",
+               dev_err(dev->dev, "unsupported operation %d\n",
                        args->operation);
                args->operation = RADEON_VA_RESULT_ERROR;
                return -EINVAL;
diff -r cc2c4aca4890 -r ae082a4e29b2 sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c        Tue Oct 27 13:16:33 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_i2c.c        Tue Oct 27 13:18:21 2015 +0000
@@ -917,7 +917,7 @@
        i2c->rec = *rec;
        i2c->adapter.owner = THIS_MODULE;
        i2c->adapter.class = I2C_CLASS_DDC;
-       i2c->adapter.dev.parent = &dev->pdev->dev;
+       i2c->adapter.dev.parent = dev->dev;
        i2c->dev = dev;
        i2c_set_adapdata(&i2c->adapter, i2c);
        if (rec->mm_i2c ||
diff -r cc2c4aca4890 -r ae082a4e29b2 sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c        Tue Oct 27 13:16:33 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_kms.c        Tue Oct 27 13:18:21 2015 +0000
@@ -126,7 +126,7 @@
         */
        r = radeon_device_init(rdev, dev, dev->pdev, flags);
        if (r) {
-               dev_err(&dev->pdev->dev, "Fatal error during GPU init\n");
+               dev_err(dev->dev, "Fatal error during GPU init\n");
                goto out;
        }
 
@@ -136,7 +136,7 @@
         */
        r = radeon_modeset_init(rdev);
        if (r)
-               dev_err(&dev->pdev->dev, "Fatal error during modeset init\n");
+               dev_err(dev->dev, "Fatal error during modeset init\n");
 
        /* Call ACPI methods: require modeset init
         * but failure is not fatal
@@ -144,7 +144,7 @@
        if (!r) {
                acpi_status = radeon_acpi_init(rdev);
                if (acpi_status)
-               dev_dbg(&dev->pdev->dev,
+               dev_dbg(dev->dev,
                                "Error during ACPI methods call\n");
        }