Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1320761pxk; Fri, 25 Sep 2020 11:33:50 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzysQNAVZbT3tAJ5xhKtkst1tHdRV+h/+TTu/zUhx5knBi2Q50bjUa0YBperwLjILteDl8J X-Received: by 2002:a50:cd51:: with SMTP id d17mr2689294edj.93.1601058829899; Fri, 25 Sep 2020 11:33:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601058829; cv=none; d=google.com; s=arc-20160816; b=ulhX+HoqTgy/I4NUKJTLqaqN3P4+XQIV5L1rsdKsnBV+44J72DVxsAGlLk9OBF7yId duO/dgzAl+rONZvHFLDGhsUXxj41BAjA1XBGEgnmOFzDkKdyuyo1kRGYDXtL3Fh0mpt/ R3AIpn9db31gqHmmLzJpnGEnTZWwqBunmy/khVc1e1lvjeQY/9ZoEClYn/5iKkM8nIrQ wpl07SwHnLPcEHP35He3zFKRvMNBybnoD/62jEx9/fLpTB73w+CWR3uS0Rg/+FbA2kMn A15iZEmUmDn795koi9xZs3KQOqII2JztJBJP4d28nrq+PrIAnnXNfpYPy5FzlhC5SbZU Rt2g== 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=ZBmnWlX2CGGKmPgqT5voHSsbFlrIBNatw9iHdtmWYAE=; b=gTW+XJjHzTlIkvsqWVph/vjhbF3krNQtVyLzjMISUiPDboL6iEJzfokKISOrAaXUEq a0jdvZrstzVJbBzed6xIeobKbYQFAWlYcWcunANLJIcf/OonA49FAD40fRdS2ZVM6GgB ZmONkZjK38JBj7Rxrw03QJ0DwFOXt/7c9tdY/cjDGq6DeoPsZehcS4aUX8EYSnFICasb aIZvPgt002I4EcWagXNwEi9ojCh6nw7XjH/JSRErf0JVhc6o+2d97ME+msWCmn0fHskN G/bgUWjlwbJ6NTphGS0LYvpNSimeUn179snnJvHsbnRMdfMDuKBBDzpBuPNM+NxSyIGv mkkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=SqKlWJvt; 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 bu5si2399501ejb.750.2020.09.25.11.33.26; Fri, 25 Sep 2020 11:33:49 -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=SqKlWJvt; 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 S1729842AbgIYSbz (ORCPT + 99 others); Fri, 25 Sep 2020 14:31:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729726AbgIYSby (ORCPT ); Fri, 25 Sep 2020 14:31:54 -0400 Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 34755C0613CE for ; Fri, 25 Sep 2020 11:31:54 -0700 (PDT) Received: by mail-pg1-x543.google.com with SMTP id k133so3297578pgc.7 for ; Fri, 25 Sep 2020 11:31:54 -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=ZBmnWlX2CGGKmPgqT5voHSsbFlrIBNatw9iHdtmWYAE=; b=SqKlWJvtpYa5wAEnP6Y5TZiFRnF3W3mL1IGbZv9hyo1xESy84AtfpXvt0oj9rVeebA LfASBHDTq9pLel5EKqlhJ769gBfsXO0mhuJiy4DrJIlotBnsS4CH/1lfyYfMOYW+MJxT g6GunrkTS+mt6GnMry3otEaxJ4CJozFfptbraSL7gP+Ejp4X7zLMUe//2PPfiDfZZ4HS DkF1PXumaTkP+V6JAiLZX9H0PN3N59FdVTq8PgfhFNb9aMOjJVY0Sr7vN7uvy2HCvQS/ x8euWthjnJgoOk4Ot4a4LgsQ/a9GwCKabWHU2NvCJ52hbDXtzyv7xujEvUjdl70KoRr/ pgYQ== 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=ZBmnWlX2CGGKmPgqT5voHSsbFlrIBNatw9iHdtmWYAE=; b=JsCZx76wx9BDWy8DDuxYVutgZXx+i+QmXujq/NB5bVOmUpKP5GXYOOnzTPnT4IcWPd vEL6n3XjhcG9XtyYeJs3rSY1YJmYRBfvxH6A1JgxJ+6ncrZIYOVEXjmyCqvU4T261CjJ ynCcwmcZUh8Y22/3o7P6+yJ2u46JYYITQuIw5VpN4WfqzQBj5evs5FeE591fjJqAUmOf fCxoN9+rqxJ2Y45i2+MYJ7Rmb12o1ZdEhnrFXdG4TDcmaiduSlpPSVaU3FUTOFCRU9eT KO4blNQI+9eLAZ9w/FP4DsBnD3o22kZ7uKBc6zFFaE+5889NkD4YnXaP/6v+cBIS6cqt 5sDg== X-Gm-Message-State: AOAM531945gMCjnj80QjyovNdXvvY3xCFh8kbounorUPqp9lgBFq6P3t YLokQpl1o7q3m+an4MqAdPwmOQ== X-Received: by 2002:a17:902:74c1:b029:d1:e598:401b with SMTP id f1-20020a17090274c1b02900d1e598401bmr661262plt.85.1601058713773; Fri, 25 Sep 2020 11:31:53 -0700 (PDT) Received: from localhost.localdomain ([51.15.160.169]) by smtp.googlemail.com with ESMTPSA id r16sm2554546pjo.19.2020.09.25.11.31.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Sep 2020 11:31:53 -0700 (PDT) From: Corentin Labbe To: gregkh@linuxfoundation.org, mchehab@kernel.org, hverkuil@xs4all.nl, laurent.pinchart@ideasonboard.com Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, Corentin Labbe Subject: [PATCH RFT/RFC v2 06/47] staging: media: zoran: do not forward declare zr36057_init_vfe Date: Fri, 25 Sep 2020 18:30:16 +0000 Message-Id: <1601058657-14042-7-git-send-email-clabbe@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1601058657-14042-1-git-send-email-clabbe@baylibre.com> References: <1601058657-14042-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 cbacfa4ea2d0..cf3e2b5e4b4e 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 @@ -1491,25 +1511,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