Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp274533pxb; Wed, 27 Oct 2021 02:50:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmNKcruAE33CegJwbfi02iFE+govH086jZiLlgc/pqAkDXHUTKJrnA1NvjjMZM2761R/Es X-Received: by 2002:a17:906:f746:: with SMTP id jp6mr6279843ejb.251.1635328244946; Wed, 27 Oct 2021 02:50:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635328244; cv=none; d=google.com; s=arc-20160816; b=SEupWEeAPcoyle7xYoDDkyLCQNBW+e9f1tS40yfMK6E+Pr598R+F6QQoW6nGomeYR1 xaTHAFtmf6vXM74IWlwPhxZbCjRuukvRvkqPj6+quAty+e187dT5YuOcvpGqL4O3uF1w M+y88j1tiUJX1TyydlcZig64yYK9L87rh+c3CAo4aUj1vFTlxUKxUmiWaeF6LTviI2vC wLk05BNMRhfOM5WgjiU4EQbX89QHMMijLDobbbeat86rlsqv0JJByN3jP5ZkE87+phE6 s8ee+pRGI9nceD3XiHU64dcz+Sdu8HaVohGjTNhRFNHCMBrDvER5cwpJ9TiGCZJ8icZX BPrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UWYtJJBsa0LLLZRoFXWiICK8It/s64t7LfobsR7d4kA=; b=xW8d8ZffxI+3z9TFgHybM5q2Oaytd6SkM57hCzNeYF3FgnfIzWKIPlKtSONHGA/M7f uQVKcf7/bg7Mkm3mW3iCLUQ+WpK5LYjdWSyRhoVSKeF8tbfQIn5Vtq1JvytIbONnhMyd AmlT/B+fJ1Z/zoX+xaGIzArvMpEV0OFw4obGdZ5I+ZTi4kEq9+uwqDs/U6D2qIXFdXdu S9DMm5lJl8+sJBitoTpJRPqWVHMFbaGM+wVOXXkr8IGOL/MEIjJVplqK7qeIk1pG28bV AGUE3j2f/uaBNd2FhzQFh6Ob+M7Joy0lZJE1yqHesEOd+Ok3eGcVijm+8qsPUInthCJy L3Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20210112.gappssmtp.com header.s=20210112 header.b=mHg6JWVG; 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 hp2si868242ejc.711.2021.10.27.02.49.35; Wed, 27 Oct 2021 02:50:44 -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.20210112.gappssmtp.com header.s=20210112 header.b=mHg6JWVG; 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 S238890AbhJZThE (ORCPT + 99 others); Tue, 26 Oct 2021 15:37:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41922 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238829AbhJZTgt (ORCPT ); Tue, 26 Oct 2021 15:36:49 -0400 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE6ABC061243 for ; Tue, 26 Oct 2021 12:34:24 -0700 (PDT) Received: by mail-wr1-x429.google.com with SMTP id i9so163257wrc.3 for ; Tue, 26 Oct 2021 12:34:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UWYtJJBsa0LLLZRoFXWiICK8It/s64t7LfobsR7d4kA=; b=mHg6JWVGv0Hyjpfx5x4LAqhJOIUpphBSvF1n6SV1kNP0jfnfvt2J+ueZJnR419jBxm gu1Iz3d8XsmsydRZnC4y5qe0zj6FjveV4ubv6+dRsvf3K/F1XqAFVY5mT3PvgCw83S7J MVl/xecgHOfyY4bGw/IUwYttTR0DUpz7eQmqctGMUmXz6MRwgj+cPNn62qHIDLiEwu/W 1Tn+iwcV3EyGb1yi3YjWFaN8X2zWmeBtvIiYK/sACk8Z/N7YTzwr9bYwmJ4OBKV79dGc j8g5vu0o4nAaGMR+tvkQyflIJ8vp0bCXWxGVEL1rg1NPX/02yYzyTkxBiLcKXT+GPpd/ Gk2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UWYtJJBsa0LLLZRoFXWiICK8It/s64t7LfobsR7d4kA=; b=GJPK54pFE/LYv82SQbvbToPgZRM61Bu7zwtAOxgTKLTFOZj6QzYqdJcTct+7Y1CZTP LazAiYMd23/vUzl6auw+8ulc1jSR9OsTtL53bn3uebI4sCl4NbXR6aOf3U1ORKzHe8y4 P65AsESzkyA/7FSjAJbuux2Z/WV6YxUB5BNo1ysjmI9PjxI3Itq3WvUBaDMz1rLtn40D +KCA9dXZzmHPs3/VZ/oJ3KhJ7nCQ6TBSVXgnCcSv757vw3Vi3O3vvnwHfrvUMM/cmAGP vGrt6c21ZjbrWGxuUiJZ8IXE4kwVaULKzciVRpzMPFvA/i829lF1GRTr2Zf8EThjwM3e OQQA== X-Gm-Message-State: AOAM533fOytJ0KrMjry5lcq6KEyWdIJKzeht6L/Ez6Op/jordLLocoO/ v1q8DgKhuXNSswTlJpm7LkGOsg== X-Received: by 2002:adf:fe45:: with SMTP id m5mr34964502wrs.197.1635276863354; Tue, 26 Oct 2021 12:34:23 -0700 (PDT) Received: from localhost.localdomain (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.googlemail.com with ESMTPSA id s18sm17676123wrb.95.2021.10.26.12.34.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Oct 2021 12:34:23 -0700 (PDT) From: Corentin Labbe To: mchehab@kernel.org, hverkuil@xs4all.nl, gregkh@linuxfoundation.org Cc: linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev, mjpeg-users@lists.sourceforge.net, Corentin Labbe Subject: [PATCH v3 03/14] staging: media: zoran: rename debug module parameter Date: Tue, 26 Oct 2021 19:34:05 +0000 Message-Id: <20211026193416.1176797-4-clabbe@baylibre.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211026193416.1176797-1-clabbe@baylibre.com> References: <20211026193416.1176797-1-clabbe@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org All zoran module will be merged, so to prevent conflict, the debug module parameter need to be renamed Signed-off-by: Corentin Labbe --- drivers/staging/media/zoran/videocodec.c | 8 ++++---- drivers/staging/media/zoran/zr36016.c | 12 ++++++------ drivers/staging/media/zoran/zr36050.c | 8 ++++---- drivers/staging/media/zoran/zr36060.c | 9 ++++----- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/staging/media/zoran/videocodec.c b/drivers/staging/media/zoran/videocodec.c index 28031d3fd757..31019b5f377e 100644 --- a/drivers/staging/media/zoran/videocodec.c +++ b/drivers/staging/media/zoran/videocodec.c @@ -26,13 +26,13 @@ #include "videocodec.h" -static int debug; -module_param(debug, int, 0); -MODULE_PARM_DESC(debug, "Debug level (0-4)"); +static int videocodec_debug; +module_param(videocodec_debug, int, 0); +MODULE_PARM_DESC(videocodec_debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ do { \ - if (debug >= num) \ + if (videocodec_debug >= num) \ printk(format, ##args); \ } while (0) diff --git a/drivers/staging/media/zoran/zr36016.c b/drivers/staging/media/zoran/zr36016.c index 9b350a885879..50605460a44b 100644 --- a/drivers/staging/media/zoran/zr36016.c +++ b/drivers/staging/media/zoran/zr36016.c @@ -22,14 +22,14 @@ /* amount of chips attached via this driver */ static int zr36016_codecs; -/* debugging is available via module parameter */ -static int debug; -module_param(debug, int, 0); -MODULE_PARM_DESC(debug, "Debug level (0-4)"); +static int zr36016_debug; +module_param(zr36016_debug, int, 0); +MODULE_PARM_DESC(zr36016_debug, "Debug level (0-4)"); + #define dprintk(num, format, args...) \ do { \ - if (debug >= num) \ + if (zr36016_debug >= num) \ printk(format, ##args); \ } while (0) @@ -120,7 +120,7 @@ static u8 zr36016_read_version(struct zr36016 *ptr) static int zr36016_basic_test(struct zr36016 *ptr) { - if (debug) { + if (zr36016_debug) { int i; zr36016_writei(ptr, ZR016I_PAX_LO, 0x55); diff --git a/drivers/staging/media/zoran/zr36050.c b/drivers/staging/media/zoran/zr36050.c index c62af27f2683..4dc7927fefc3 100644 --- a/drivers/staging/media/zoran/zr36050.c +++ b/drivers/staging/media/zoran/zr36050.c @@ -32,13 +32,13 @@ static int zr36050_codecs; /* debugging is available via module parameter */ -static int debug; -module_param(debug, int, 0); -MODULE_PARM_DESC(debug, "Debug level (0-4)"); +static int zr36050_debug; +module_param(zr36050_debug, int, 0); +MODULE_PARM_DESC(zr36050_debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ do { \ - if (debug >= num) \ + if (zr36050_debug >= num) \ printk(format, ##args); \ } while (0) diff --git a/drivers/staging/media/zoran/zr36060.c b/drivers/staging/media/zoran/zr36060.c index 1c3af11b5f24..7904d5b1f402 100644 --- a/drivers/staging/media/zoran/zr36060.c +++ b/drivers/staging/media/zoran/zr36060.c @@ -34,14 +34,13 @@ static bool low_bitrate; module_param(low_bitrate, bool, 0); MODULE_PARM_DESC(low_bitrate, "Buz compatibility option, halves bitrate"); -/* debugging is available via module parameter */ -static int debug; -module_param(debug, int, 0); -MODULE_PARM_DESC(debug, "Debug level (0-4)"); +static int zr36060_debug; +module_param(zr36060_debug, int, 0); +MODULE_PARM_DESC(zr36060_debug, "Debug level (0-4)"); #define dprintk(num, format, args...) \ do { \ - if (debug >= num) \ + if (zr36060_debug >= num) \ printk(format, ##args); \ } while (0) -- 2.32.0