From patchwork Tue Jan 13 17:46:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 5622961 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5573C9F2ED for ; Tue, 13 Jan 2015 17:47:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D704205F7 for ; Tue, 13 Jan 2015 17:47:27 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5259D2039C for ; Tue, 13 Jan 2015 17:47:26 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A46E47209B; Tue, 13 Jan 2015 09:47:21 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f172.google.com (mail-qc0-f172.google.com [209.85.216.172]) by gabe.freedesktop.org (Postfix) with ESMTP id 4E8A76E680 for ; Tue, 13 Jan 2015 09:47:19 -0800 (PST) Received: by mail-qc0-f172.google.com with SMTP id m20so3431197qcx.3 for ; Tue, 13 Jan 2015 09:47:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ypS+zd7htDA2ZA0b9LtVAbMbwY5ZsBbBNvYFg8pIDrQ=; b=IXfhSiDy9sNTQCnmlG+U4jng3e2unrdCw0O3gPa9DlgZKQDSew7pDpO9LQLENrwr5e gFSM+b0HSfHUvgPFPX7sUGpD+ibpf4p91QfEDCH7e1UuSc7Ng36QA49NQLjCpwHp7c6B 7OEr/114ijJeZZNYzedHEADVL/t4mnLXR7kcQMsrojnMVsUZsSssSVyNmK6y6cb15jRM KWepPY0yMJqmQFpvf1yKb9YCxBwdv8+2nJGrAbNdSYMnzcMaYU/KgP8UgUXfXNmAkhAz 85lwrE0NqWKdTNrVfrGvxG0BIJoOiFrh+BSdXv8Jt7+T/OoH7+pZfa3Rc2Dth43zzdCV zeRg== X-Received: by 10.224.63.70 with SMTP id a6mr58538355qai.42.1421171235227; Tue, 13 Jan 2015 09:47:15 -0800 (PST) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id 43sm18213707qgb.17.2015.01.13.09.47.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jan 2015 09:47:14 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 24/24] drm/radeon: whitespace clean up in radeon_audio.c Date: Tue, 13 Jan 2015 12:46:53 -0500 Message-Id: <1421171213-23977-25-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1421171213-23977-1-git-send-email-alexander.deucher@amd.com> References: <1421171213-23977-1-git-send-email-alexander.deucher@amd.com> Cc: Alex Deucher , slava.grigorev@amd.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Clean up some formatting in radeon_audio.c to be more consistent with the rest of the driver. Signed-off-by: Alex Deucher --- drivers/gpu/drm/radeon/radeon_audio.c | 70 +++++++++++++++++------------------ 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_audio.c b/drivers/gpu/drm/radeon/radeon_audio.c index b77a8d6..e4aa282 100644 --- a/drivers/gpu/drm/radeon/radeon_audio.c +++ b/drivers/gpu/drm/radeon/radeon_audio.c @@ -366,36 +366,36 @@ static void radeon_audio_write_sad_regs(struct drm_encoder *encoder) static void radeon_audio_write_speaker_allocation(struct drm_encoder *encoder) { struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct drm_connector *connector; - struct radeon_connector *radeon_connector = NULL; - u8 *sadb = NULL; - int sad_count; + struct drm_connector *connector; + struct radeon_connector *radeon_connector = NULL; + u8 *sadb = NULL; + int sad_count; - list_for_each_entry(connector, - &encoder->dev->mode_config.connector_list, head) { - if (connector->encoder == encoder) { - radeon_connector = to_radeon_connector(connector); - break; - } - } - - if (!radeon_connector) { - DRM_ERROR("Couldn't find encoder's connector\n"); - return; - } - - sad_count = drm_edid_to_speaker_allocation( + list_for_each_entry(connector, + &encoder->dev->mode_config.connector_list, head) { + if (connector->encoder == encoder) { + radeon_connector = to_radeon_connector(connector); + break; + } + } + + if (!radeon_connector) { + DRM_ERROR("Couldn't find encoder's connector\n"); + return; + } + + sad_count = drm_edid_to_speaker_allocation( radeon_connector_edid(connector), &sadb); - if (sad_count < 0) { - DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", - sad_count); - sad_count = 0; - } + if (sad_count < 0) { + DRM_DEBUG("Couldn't read Speaker Allocation Data Block: %d\n", + sad_count); + sad_count = 0; + } if (radeon_encoder->audio && radeon_encoder->audio->write_speaker_allocation) radeon_encoder->audio->write_speaker_allocation(encoder, sadb, sad_count); - kfree(sadb); + kfree(sadb); } static void radeon_audio_write_latency_fields(struct drm_encoder *encoder, @@ -519,7 +519,7 @@ static void radeon_audio_set_dto(struct drm_encoder *encoder, unsigned int clock static int radeon_audio_set_avi_packet(struct drm_encoder *encoder, struct drm_display_mode *mode) { - struct radeon_device *rdev = encoder->dev->dev_private; + struct radeon_device *rdev = encoder->dev->dev_private; struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE]; @@ -624,9 +624,9 @@ static const struct radeon_hdmi_acr* radeon_audio_acr(unsigned int clock) */ static void radeon_audio_update_acr(struct drm_encoder *encoder, unsigned int clock) { - const struct radeon_hdmi_acr *acr = radeon_audio_acr(clock); - struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; + const struct radeon_hdmi_acr *acr = radeon_audio_acr(clock); + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; if (!dig || !dig->afmt) return; @@ -637,8 +637,8 @@ static void radeon_audio_update_acr(struct drm_encoder *encoder, unsigned int cl static void radeon_audio_set_vbi_packet(struct drm_encoder *encoder) { - struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; if (!dig || !dig->afmt) return; @@ -667,8 +667,8 @@ static void radeon_hdmi_set_color_depth(struct drm_encoder *encoder) static void radeon_audio_set_audio_packet(struct drm_encoder *encoder) { - struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; if (!dig || !dig->afmt) return; @@ -679,8 +679,8 @@ static void radeon_audio_set_audio_packet(struct drm_encoder *encoder) static void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute) { - struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); - struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; + struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); + struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; if (!dig || !dig->afmt) return; @@ -695,7 +695,7 @@ static void radeon_audio_set_mute(struct drm_encoder *encoder, bool mute) static void radeon_audio_hdmi_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode) { - struct radeon_device *rdev = encoder->dev->dev_private; + struct radeon_device *rdev = encoder->dev->dev_private; struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv;