Skip to content

Commit

Permalink
drm/radeon/kms: trivial code style fixes for audio
Browse files Browse the repository at this point in the history
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
  • Loading branch information
Rafał Miłecki authored and Dave Airlie committed Aug 2, 2010
1 parent b417cc1 commit 219de62
Showing 1 changed file with 10 additions and 6 deletions.
16 changes: 10 additions & 6 deletions drivers/gpu/drm/radeon/r600_audio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -150,15 +151,16 @@ 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);
}

/*
* turn on/off audio engine
*/
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;
}
Expand Down Expand Up @@ -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;

Expand All @@ -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;
}

Expand All @@ -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;
}
Expand Down

0 comments on commit 219de62

Please sign in to comment.