diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2010-06-25 15:24:20 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:17:10 -0400 |
| commit | 219de62a1627247fca10789f28902f66cb0b408f (patch) | |
| tree | 24cea2bed659816efa81fc1fffb11f61e0942931 | |
| parent | b417cc117a104ea457be18cfde9df9d69c21fa62 (diff) | |
drm/radeon/kms: trivial code style fixes for audio
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/radeon/r600_audio.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index 631e1edc373a..b5443fe1c1d1 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c | |||
| @@ -63,7 +63,8 @@ int r600_audio_bits_per_sample(struct radeon_device *rdev) | |||
| 63 | case 0x4: return 32; | 63 | case 0x4: return 32; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | DRM_ERROR("Unknown bits per sample 0x%x using 16 instead.\n", (int)value); | 66 | dev_err(rdev->dev, "Unknown bits per sample 0x%x using 16 instead\n", |
| 67 | (int)value); | ||
| 67 | 68 | ||
| 68 | return 16; | 69 | return 16; |
| 69 | } | 70 | } |
| @@ -150,7 +151,8 @@ static void r600_audio_update_hdmi(unsigned long param) | |||
| 150 | r600_hdmi_update_audio_settings(encoder); | 151 | r600_hdmi_update_audio_settings(encoder); |
| 151 | } | 152 | } |
| 152 | 153 | ||
| 153 | if(still_going) r600_audio_schedule_polling(rdev); | 154 | if (still_going) |
| 155 | r600_audio_schedule_polling(rdev); | ||
| 154 | } | 156 | } |
| 155 | 157 | ||
| 156 | /* | 158 | /* |
| @@ -158,7 +160,7 @@ static void r600_audio_update_hdmi(unsigned long param) | |||
| 158 | */ | 160 | */ |
| 159 | static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable) | 161 | static void r600_audio_engine_enable(struct radeon_device *rdev, bool enable) |
| 160 | { | 162 | { |
| 161 | DRM_INFO("%s audio support", enable ? "Enabling" : "Disabling"); | 163 | DRM_INFO("%s audio support\n", enable ? "Enabling" : "Disabling"); |
| 162 | WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000); | 164 | WREG32_P(R600_AUDIO_ENABLE, enable ? 0x81000000 : 0x0, ~0x81000000); |
| 163 | rdev->audio_enabled = enable; | 165 | rdev->audio_enabled = enable; |
| 164 | } | 166 | } |
| @@ -196,7 +198,8 @@ void r600_audio_enable_polling(struct drm_encoder *encoder) | |||
| 196 | struct radeon_device *rdev = dev->dev_private; | 198 | struct radeon_device *rdev = dev->dev_private; |
| 197 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 199 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 198 | 200 | ||
| 199 | DRM_DEBUG("r600_audio_enable_polling: %d", radeon_encoder->audio_polling_active); | 201 | DRM_DEBUG("r600_audio_enable_polling: %d\n", |
| 202 | radeon_encoder->audio_polling_active); | ||
| 200 | if (radeon_encoder->audio_polling_active) | 203 | if (radeon_encoder->audio_polling_active) |
| 201 | return; | 204 | return; |
| 202 | 205 | ||
| @@ -211,7 +214,8 @@ void r600_audio_enable_polling(struct drm_encoder *encoder) | |||
| 211 | void r600_audio_disable_polling(struct drm_encoder *encoder) | 214 | void r600_audio_disable_polling(struct drm_encoder *encoder) |
| 212 | { | 215 | { |
| 213 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 216 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 214 | DRM_DEBUG("r600_audio_disable_polling: %d", radeon_encoder->audio_polling_active); | 217 | DRM_DEBUG("r600_audio_disable_polling: %d\n", |
| 218 | radeon_encoder->audio_polling_active); | ||
| 215 | radeon_encoder->audio_polling_active = 0; | 219 | radeon_encoder->audio_polling_active = 0; |
| 216 | } | 220 | } |
| 217 | 221 | ||
| @@ -238,7 +242,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) | |||
| 238 | WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301); | 242 | WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301); |
| 239 | break; | 243 | break; |
| 240 | default: | 244 | default: |
| 241 | DRM_ERROR("Unsupported encoder type 0x%02X\n", | 245 | dev_err(rdev->dev, "Unsupported encoder type 0x%02X\n", |
| 242 | radeon_encoder->encoder_id); | 246 | radeon_encoder->encoder_id); |
| 243 | return; | 247 | return; |
| 244 | } | 248 | } |
