]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/radeon/kms: trivial code style fixes for audio
authorRafał Miłecki <zajec5@gmail.com>
Fri, 25 Jun 2010 19:24:20 +0000 (21:24 +0200)
committerDave Airlie <airlied@redhat.com>
Mon, 2 Aug 2010 00:17:10 +0000 (10:17 +1000)
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/r600_audio.c

index 631e1edc373a60b0dbc34b4bf71c39fa5b8e24e0..b5443fe1c1d1173c653483bec8a142832fe16509 100644 (file)
@@ -63,7 +63,8 @@ int r600_audio_bits_per_sample(struct radeon_device *rdev)
        case 0x4: return 32;
        }
 
-       DRM_ERROR("Unknown bits per sample 0x%x using 16 instead.\n", (int)value);
+       dev_err(rdev->dev, "Unknown bits per sample 0x%x using 16 instead\n",
+               (int)value);
 
        return 16;
 }
@@ -150,7 +151,8 @@ static void r600_audio_update_hdmi(unsigned long param)
                        r600_hdmi_update_audio_settings(encoder);
        }
 
-       if(still_going) r600_audio_schedule_polling(rdev);
+       if (still_going)
+               r600_audio_schedule_polling(rdev);
 }
 
 /*
@@ -158,7 +160,7 @@ static void r600_audio_update_hdmi(unsigned long param)
  */
 static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable)
 {
-       DRM_INFO("%s audio support", enable ? "Enabling" : "Disabling");
+       DRM_INFO("%s audio support\n", enable ? "Enabling" : "Disabling");
        WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000);
        rdev->audio_enabled = enable;
 }
@@ -196,7 +198,8 @@ void r600_audio_enable_polling(struct drm_encoder *encoder)
        struct radeon_device *rdev = dev->dev_private;
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
 
-       DRM_DEBUG("r600_audio_enable_polling: %d", radeon_encoder->audio_polling_active);
+       DRM_DEBUG("r600_audio_enable_polling: %d\n",
+               radeon_encoder->audio_polling_active);
        if (radeon_encoder->audio_polling_active)
                return;
 
@@ -211,7 +214,8 @@ void r600_audio_enable_polling(struct drm_encoder *encoder)
 void r600_audio_disable_polling(struct drm_encoder *encoder)
 {
        struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
-       DRM_DEBUG("r600_audio_disable_polling: %d", radeon_encoder->audio_polling_active);
+       DRM_DEBUG("r600_audio_disable_polling: %d\n",
+               radeon_encoder->audio_polling_active);
        radeon_encoder->audio_polling_active = 0;
 }
 
@@ -238,7 +242,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock)
                WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301);
                break;
        default:
-               DRM_ERROR("Unsupported encoder type 0x%02X\n",
+               dev_err(rdev->dev, "Unsupported encoder type 0x%02X\n",
                          radeon_encoder->encoder_id);
                return;
        }