Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp3026271pxk; Mon, 21 Sep 2020 03:27:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgTxpK3CjMZhfVbs7ALgKacfi6P3tV+J1vcPBK01k0tbdnVJNJ3SDTkmpcxlCZ9Aq89uEC X-Received: by 2002:a17:906:9718:: with SMTP id k24mr46240388ejx.365.1600684021351; Mon, 21 Sep 2020 03:27:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600684021; cv=none; d=google.com; s=arc-20160816; b=HMT7UBEohnFAb5VNwslJwsiUTD7+IVLRjVT5jEKVdq6E/dTOjKzuoZI2RiokCbOHs0 4kiIEeY8jlCLk9EbO7fzGrQ/+N8bYA9H4dEQBKcSMCar1c2A8WuB/NIJt5uYanqW3VAC eGei5LE+xQivMvh7EfpgxpbgiuVXeHP+gUJgDpZSIJ5XaGFiSgrAiGrVnOeCelJOafvq wsTyuBRZpCsTZTxrONA0zlnbyS/eQ2JdHLU28JQp8LmlZxyScWZfkSBj4HmtQ3TxWxXC 72Pb/+luj8X84iwQu923h6oQfHoG8raH30GZTm4iDOM2oW/eXIPFhpry/na2GuBsc+ly soow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from:dkim-signature; bh=yT+7g7cZmwgOzhVIcE+1qXxZwSKLTSSFChevbMCeH+o=; b=g/LQDD+jvedd8Qsoj3NPJbtqYdxxun0lTsT97gFH+42uSIsruK/pDuZLvEy0r1ZlCn MtQ/8BZyKgiJlwvNcOPUkFwQiPTWYU45mR/EAqAlID9Jn3Q8YKC/4drUd8TnmG0nJtwq VHUN4J4ItbFKlB2eRzrcUabOz9CaP5jJJGIEuPBCID393PbaQcUzg44cgfMB1pGhwz+R lZL5yUViNByk32J6RlBaOI3smpI4hSHVrGADjom7rZYJjR7tPOQWy12fZAZwJ5HLvyqQ UtaadT14PyuQ3R90IQMQ1ZLb3fFqzF8GGWhHD1pLNkiJsJuDWnVa2VekD2Km/9TJ8BX1 prkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=EwZ63cO+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y22si7904534edo.147.2020.09.21.03.26.38; Mon, 21 Sep 2020 03:27:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=EwZ63cO+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727276AbgIUKYc (ORCPT + 99 others); Mon, 21 Sep 2020 06:24:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59014 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726789AbgIUKUl (ORCPT ); Mon, 21 Sep 2020 06:20:41 -0400 Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89B4DC0613CF for ; Mon, 21 Sep 2020 03:20:40 -0700 (PDT) Received: by mail-wr1-x441.google.com with SMTP id g4so12116475wrs.5 for ; Mon, 21 Sep 2020 03:20:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yT+7g7cZmwgOzhVIcE+1qXxZwSKLTSSFChevbMCeH+o=; b=EwZ63cO+tlKq2AG2nWrD4d2XhWegdUe1jNXNvFBAHdNz9ilGkOuIxnjK/BXVeAztet sMdaHyNIncAkyoVjVduxgUryKkGRtPpK8qeDio3OCo3s6f2+N2h9ZrPSqPURG0CHPbPF xTaCDKucrtN/tEy9toRvNYHhRsriAYOexDMdaidTJMK4cIis90vX6y0DYFhFJT4xeRBq t97KIVx6XPo79l8Crf+CMlOCgYbbaMoha0RzONlzpAmLmupgrfhJoBiKH9+C+879JCS+ SBWX+qDB81ND2VSRf20KfJZyWzjp/ebLz0TSzJSK8LPNkq3a4gGl4EpfolRezWGKTY4J j/qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yT+7g7cZmwgOzhVIcE+1qXxZwSKLTSSFChevbMCeH+o=; b=eUVYmgXTexOSWC/9xZP9jBWzXfmB5nIoIAbe48fgH03Roti8YORXKv2toa2t0WExB2 OuESX2x+RM76uX4TbHIYjaOi1xLnlM6CnYq/u+Z/j/Mq02x+28RIJ1WYU5P7/tJvwBfx uJUKnOE+2n0Z0NnQAwcaGSKx9rBPyGJNhJss8X/Xq+g7E3XLeQ8aciPwNA+S2Qeqcz9B SvlLzmfusQUPI1s9kcgebJwRNN58pJiXnaqB9/p+3+L/HE4opDDAGw79tVQ3dXrNp3B8 SilWfCiiltG+D07Ex6XgxLOyvta7pzPEN4C/tST7UjEOWjTCT2y7DoCN0zEkVol3yX9M mTKQ== X-Gm-Message-State: AOAM5310QbZqHgURZI8fXkB0eYCRm5ARowaok72yE/LBr6Z+EPm0NPS7 5jlBxpfPK3rVt7j9R4adBhiFjw== X-Received: by 2002:a5d:568d:: with SMTP id f13mr50608020wrv.303.1600683639289; Mon, 21 Sep 2020 03:20:39 -0700 (PDT) Received: from localhost.localdomain ([51.15.160.169]) by smtp.googlemail.com with ESMTPSA id l17sm18804629wme.11.2020.09.21.03.20.38 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Sep 2020 03:20:38 -0700 (PDT) From: Corentin Labbe To: gregkh@linuxfoundation.org, laurent.pinchart@skynet.be, mchehab@kernel.org Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Corentin Labbe Subject: [PATCH RFT/RFC 07/49] staging: media: zoran: do not forward declare zr36057_init_vfe Date: Mon, 21 Sep 2020 10:19:42 +0000 Message-Id: <1600683624-5863-8-git-send-email-clabbe@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1600683624-5863-1-git-send-email-clabbe@baylibre.com> References: <1600683624-5863-1-git-send-email-clabbe@baylibre.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org move function for avoiding forward declaration Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/zoran_device.c | 44 +++++++++++----------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/drivers/staging/media/zoran/zoran_device.c b/drivers/staging/media/zoran/zoran_device.c index 783d7bce6c80..0985b16d5a55 100644 --- a/drivers/staging/media/zoran/zoran_device.c +++ b/drivers/staging/media/zoran/zoran_device.c @@ -55,7 +55,27 @@ static bool lml33dpath; /* default = 0 module_param(lml33dpath, bool, 0644); MODULE_PARM_DESC(lml33dpath, "Use digital path capture mode (on LML33 cards)"); -static void zr36057_init_vfe(struct zoran *zr); +/* + * initialize video front end + */ +static void zr36057_init_vfe(struct zoran *zr) +{ + u32 reg; + + reg = btread(ZR36057_VFESPFR); + reg |= ZR36057_VFESPFR_LittleEndian; + reg &= ~ZR36057_VFESPFR_VCLKPol; + reg |= ZR36057_VFESPFR_ExtFl; + reg |= ZR36057_VFESPFR_TopField; + btwrite(reg, ZR36057_VFESPFR); + reg = btread(ZR36057_VDCR); + if (pci_pci_problems & PCIPCI_TRITON) + // || zr->revision < 1) // Revision 1 has also Triton support + reg &= ~ZR36057_VDCR_Triton; + else + reg |= ZR36057_VDCR_Triton; + btwrite(reg, ZR36057_VDCR); +} /* * General Purpose I/O and Guest bus access @@ -1474,25 +1494,3 @@ void zr36057_restart(struct zoran *zr) btwrite((0x81 << 24) | 0x8888, ZR36057_GPPGCR1); } -/* - * initialize video front end - */ - -static void zr36057_init_vfe(struct zoran *zr) -{ - u32 reg; - - reg = btread(ZR36057_VFESPFR); - reg |= ZR36057_VFESPFR_LittleEndian; - reg &= ~ZR36057_VFESPFR_VCLKPol; - reg |= ZR36057_VFESPFR_ExtFl; - reg |= ZR36057_VFESPFR_TopField; - btwrite(reg, ZR36057_VFESPFR); - reg = btread(ZR36057_VDCR); - if (pci_pci_problems & PCIPCI_TRITON) - // || zr->revision < 1) // Revision 1 has also Triton support - reg &= ~ZR36057_VDCR_Triton; - else - reg |= ZR36057_VDCR_Triton; - btwrite(reg, ZR36057_VDCR); -} -- 2.26.2