From patchwork Thu Aug 9 06:33:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dror Cohen X-Patchwork-Id: 1298851 Return-Path: X-Original-To: patchwork-davinci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by patchwork1.kernel.org (Postfix) with ESMTP id 14B913FC23 for ; Thu, 9 Aug 2012 06:36:07 +0000 (UTC) Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id q796YRsv028694; Thu, 9 Aug 2012 01:34:27 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id q796YQrw016125; Thu, 9 Aug 2012 01:34:26 -0500 Received: from dlelxv24.itg.ti.com (172.17.1.199) by dfle72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.1.323.3; Thu, 9 Aug 2012 01:34:26 -0500 Received: from linux.omap.com (dlelxs01.itg.ti.com [157.170.227.31]) by dlelxv24.itg.ti.com (8.13.8/8.13.8) with ESMTP id q796YPiG028744; Thu, 9 Aug 2012 01:34:26 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 871148062B; Thu, 9 Aug 2012 01:34:25 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id EE92480626 for ; Thu, 9 Aug 2012 01:34:21 -0500 (CDT) Received: from red.ext.ti.com (red.ext.ti.com [192.94.93.37]) by dflp52.itg.ti.com (8.13.7/8.13.8) with ESMTP id q796YLbF022781 for ; Thu, 9 Aug 2012 01:34:21 -0500 (CDT) Received: from psmtp.com (na3sys009amx163.postini.com [74.125.149.89]) by red.ext.ti.com (8.13.7/8.13.7) with SMTP id q796YKQk003974 for ; Thu, 9 Aug 2012 01:34:21 -0500 Received: from eu1sys200aog117.obsmtp.com ([207.126.144.143]) by na3sys009amx163.postini.com ([74.125.148.10]) with SMTP; Wed, 08 Aug 2012 23:34:21 PDT Received: from mail-wi0-f175.google.com ([209.85.212.175]) (using TLSv1) by eu1sys200aob117.postini.com ([207.126.147.11]) with SMTP ID DSNKUCNZ65x2E/3zzpFVqumKnZP7TQfypZr/@postini.com; Thu, 09 Aug 2012 06:34:21 UTC Received: by mail-wi0-f175.google.com with SMTP id hm2so12543wib.16 for ; Wed, 08 Aug 2012 23:34:19 -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=1JTiEdPFF21IH6bmwFCcUEkgnZMbe4ZSo1PqaF5gwYQ=; b=oEiJgtpkE+nND4+Ke5C9ij7UNYsb9gqwXs59F/K1GxXmvgkNltp6D2gKI0ezQRakit JqV5GF9X0HcnXCkU2WIYURRPOzYMHzDVh0E+YsOedjYLcb+J3ZwJXNqDf4Yacpphz//c 5mhjb93zJmvNC2qi0dgtxvQnKObIA6D9CW3Qw= 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=1JTiEdPFF21IH6bmwFCcUEkgnZMbe4ZSo1PqaF5gwYQ=; b=H30eAx67XZSLm1YfxiuLu8go2Z1BzHwAYij3+Y9EAR6LiveDjt4tlrLGaqsRtK4Aio qVr9JOAzbYojwkkBFzcOfP07Y7PJjtwJ3eKO33GGhyTngK1P3s/TJxJWgsSaYPlhRsg1 jVziB/9/ksZTH4bsJZ2NPACV0I5wMoSwA2MnD5pYzeyEh1TezHAAyypQgAR7m7dRtEUN yxF3/D5hLmXviPH7wZ+QMQHCtaLCUw3k6jlskI1iiKgAvW/CY2bvSTElbA+uN7CjZJJD Dct0fWLZZ+KgFv2BZzMUKmZ2LW4QGJsta2StvStRWi9M8NwzuODTN+5R7Cnwd3K0MAli 2bcQ== Received: by 10.216.29.17 with SMTP id h17mr1289248wea.221.1344494059508; Wed, 08 Aug 2012 23:34:19 -0700 (PDT) Received: from drorlenovo.liveu.tv (82-166-164-178.barak.net.il. [82.166.164.178]) by mx.google.com with ESMTPS id ex20sm151798wid.7.2012.08.08.23.34.17 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 08 Aug 2012 23:34:18 -0700 (PDT) From: Dror Cohen To: Subject: [PATCH 1/1 v2] media/video: vpif: fixing function name start to vpif_config_params Date: Thu, 9 Aug 2012 09:33:37 +0300 Message-ID: <1344494017-18099-2-git-send-email-dror@liveu.tv> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344494017-18099-1-git-send-email-dror@liveu.tv> References: <1344494017-18099-1-git-send-email-dror@liveu.tv> Signed-off-by: dror@liveu.tv X-Gm-Message-State: ALoCoQlw5c5FiBr2YBQNPrMEyEMXdZMwqOlqh0gw1X8CTC1DIFSEqI+W1ym5J/QCAs5YgQa0Dnee X-pstn-neptune: 0/0/0.00/0 X-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390 R:95.9108 P:95.9108 M:97.0282 C:98.6951 ) X-pstn-dkim: 1 skipped:not-enabled X-pstn-settings: 2 (0.5000:0.0050) s cv GT3 gt2 gt1 r p m c X-pstn-addresses: from [82/3] CC: , X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com 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 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 { 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 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 { u32 min_bufsize[VPIF_DISPLAY_NUM_CHANNELS]; u32 channel_bufsize[VPIF_DISPLAY_NUM_CHANNELS]; u8 numbuffers[VPIF_DISPLAY_NUM_CHANNELS];