From patchwork Thu Aug 2 07:40:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dror Cohen X-Patchwork-Id: 1266701 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id E3E2F3FCC5 for ; Thu, 2 Aug 2012 07:41:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211Ab2HBHk7 (ORCPT ); Thu, 2 Aug 2012 03:40:59 -0400 Received: from eu1sys200aog103.obsmtp.com ([207.126.144.115]:41496 "HELO eu1sys200aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1752910Ab2HBHk6 (ORCPT ); Thu, 2 Aug 2012 03:40:58 -0400 Received: from mail-we0-f175.google.com ([74.125.82.175]) (using TLSv1) by eu1sys200aob103.postini.com ([207.126.147.11]) with SMTP ID DSNKUBovCRFDgw5g8l0EUlUqll9pr7IyR+/6@postini.com; Thu, 02 Aug 2012 07:40:58 UTC Received: by weyr6 with SMTP id r6so5234883wey.6 for ; Thu, 02 Aug 2012 00:40:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=liveu.tv; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :signed-off-by; bh=lC82oHNYO7vtR9LOevN5miipptKAbkEDFeoX6GCRDKQ=; b=L6bb319MX04YApo7vnikneihXZSygVZ1MZwEIdqcmuzPli3hX3/PQKVIrAekcoArEy ZBkPUdpG7iFM0ogdp+ban1dUF8agxB7GR+1VNr3jAxwFF+cTPnKHbjOM3udMctjef5dG BUyMTR+76zLhf54E6GbFGguYofmtrRdMBVYqA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :signed-off-by:x-gm-message-state; bh=lC82oHNYO7vtR9LOevN5miipptKAbkEDFeoX6GCRDKQ=; b=QuUXNUfJ3AYDZLDBslGNQUi+YPYO0zqcXo8AcbaYkP4VLW0DPqhfJ9k4dRMxRy3gR2 VAFqVyaNrWHk31SEH5Am3LyatmpFi9qQDB7etW9cG03AvprQU8c63SK8KBGfpyHf7p0s 36lnsno1GsII/YDsOaSihXPBNi+vfUXS4t2aYqPr8MaI2NgkWs6pcO+FnjSOJRLPpsdM IMac/bU3s4JGdFr70w15AHa2SGDhd1qQT0KOWKAQoBlfPqY0fR7P0ku/Le1NAr9+STYX ngct6BG7uyh8vcrgzyj+dcQx0GJR7UXLogEkvC+pa67/qi6qY/JNUKOhD+5m6w5M3M7L +6eg== Received: by 10.216.138.92 with SMTP id z70mr9827057wei.68.1343893257088; Thu, 02 Aug 2012 00:40:57 -0700 (PDT) Received: from drorlenovo.?null? ([199.203.78.113]) by mx.google.com with ESMTPS id fr4sm15298779wib.8.2012.08.02.00.40.54 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 02 Aug 2012 00:40:56 -0700 (PDT) From: Dror Cohen To: linux-media@vger.kernel.org Cc: mchehab@infradead.org, nsekhar@ti.com, davinci-linux-open-source@linux.davincidsp.com, Dror Cohen Subject: [PATCH 1/1] media/video: vpif: fixing function name start to vpif_config_params Date: Thu, 2 Aug 2012 10:40:32 +0300 Message-Id: <1343893232-19543-2-git-send-email-dror@liveu.tv> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343893232-19543-1-git-send-email-dror@liveu.tv> References: <1343893232-19543-1-git-send-email-dror@liveu.tv> Signed-off-by: dror@liveu.tv X-Gm-Message-State: ALoCoQl4vXOKJ8O4OTnyW1c/d5beO+PqQhVofkgglU6l3tabaX/DdMUf1ik/nJ91vGDv9npup08k Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/video/davinci/vpif.c b/drivers/media/video/davinci/vpif.c index af96802..04dd8fa 100644 --- a/drivers/media/video/davinci/vpif.c +++ b/drivers/media/video/davinci/vpif.c @@ -301,12 +301,12 @@ static void vpif_set_mode_info(const struct vpif_channel_config_params *config, regw(value, vpifregs[channel_id].v_cfg); } -/* config_vpif_params +/* vpif_config_params * Function to set the parameters of a channel * Mainly modifies the channel ciontrol register * It sets frame format, yc mux mode */ -static void config_vpif_params(struct vpif_params *vpifparams, +static void vpif_config_params(struct vpif_params *vpifparams, u8 channel_id, u8 found) { const struct vpif_channel_config_params *config = &vpifparams->std_info; @@ -374,7 +374,7 @@ int vpif_set_video_params(struct vpif_params *vpifparams, u8 channel_id) found = 2; } - config_vpif_params(vpifparams, channel_id, found); + vpif_config_params(vpifparams, channel_id, found); regw(0x80, VPIF_REQ_SIZE); regw(0x01, VPIF_EMULATION_CTRL); diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c index 9604695..59104e6 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/drivers/media/video/davinci/vpif_capture.c @@ -67,7 +67,7 @@ MODULE_PARM_DESC(ch3_numbuffers, "Channel1 buffer count (default:3)"); MODULE_PARM_DESC(ch2_bufsize, "Channel0 buffer size (default:1920 x 1080 x 2)"); MODULE_PARM_DESC(ch3_bufsize, "Channel1 buffer size (default:720 x 576 x 2)"); -static struct vpif_config_params config_params = { +static struct config_vpif_params_t config_params = { .min_numbuffers = 3, .numbuffers[0] = 3, .numbuffers[1] = 3, diff --git a/drivers/media/video/davinci/vpif_capture.h b/drivers/media/video/davinci/vpif_capture.h index a693d4e..8863de1 100644 --- a/drivers/media/video/davinci/vpif_capture.h +++ b/drivers/media/video/davinci/vpif_capture.h @@ -144,7 +144,7 @@ struct vpif_device { struct v4l2_subdev **sd; }; -struct vpif_config_params { +struct config_vpif_params_t { u8 min_numbuffers; u8 numbuffers[VPIF_CAPTURE_NUM_CHANNELS]; s8 device_type; diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index e6488ee..652440d 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c @@ -70,7 +70,7 @@ MODULE_PARM_DESC(ch3_numbuffers, "Channel3 buffer count (default:3)"); MODULE_PARM_DESC(ch2_bufsize, "Channel2 buffer size (default:1920 x 1080 x 2)"); MODULE_PARM_DESC(ch3_bufsize, "Channel3 buffer size (default:720 x 576 x 2)"); -static struct vpif_config_params config_params = { +static struct config_vpif_params_t config_params = { .min_numbuffers = 3, .numbuffers[0] = 3, .numbuffers[1] = 3, diff --git a/drivers/media/video/davinci/vpif_display.h b/drivers/media/video/davinci/vpif_display.h index 56879d1..3e14807 100644 --- a/drivers/media/video/davinci/vpif_display.h +++ b/drivers/media/video/davinci/vpif_display.h @@ -154,7 +154,7 @@ struct vpif_device { }; -struct vpif_config_params { +struct config_vpif_params_t { u32 min_bufsize[VPIF_DISPLAY_NUM_CHANNELS]; u32 channel_bufsize[VPIF_DISPLAY_NUM_CHANNELS]; u8 numbuffers[VPIF_DISPLAY_NUM_CHANNELS];