From patchwork Wed Jun 12 16:19:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 166581 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp3877079ilk; Wed, 12 Jun 2019 09:19:46 -0700 (PDT) X-Google-Smtp-Source: APXvYqzG0Id2anRtYa1/VFLKPb34tq2rmBuFI8DWfvK1BlmwJNgu7rntAiIk9Zjy2StPImODHyGb X-Received: by 2002:a17:90a:3aed:: with SMTP id b100mr5256pjc.63.1560356386400; Wed, 12 Jun 2019 09:19:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560356386; cv=none; d=google.com; s=arc-20160816; b=0ARsmAXU9fPMsKfjVWwuZmOl/UQMI5aB9o8zpHxHlOdBCMLmgDgh3fBrg7NuJSZUmF keyMbul2SiNyS05PCYfRcMrjTmX+DbXs+ZPfiCkFjmb9M+7qA5EQUy7aHlOGkfPl1Shk AFAVHrIZgKcjX+C04ZZiNMb4uS+bwQYiSklp1/rZol28GqEAYsZfM76/Ae/uMYlEo7LU izEWGVdv2zAkEhn3hXGj8pMeRoSLTbyyt5jxvlNzpsLQJ7mpgBu258p6j6PxDgf3yt4z YYUOmA8isyzeH3VYIBJhTI4pC+TvoEv5P7DOyP7yYqqA7kO0n6kA8937NNrHhva5bw0x 2T4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=Me1o0WCLHrdj4pGzYt4+EVkLIwsOiL3bGNYyI4+f4XA=; b=wUERnWiyF4H3yqdaJE4Fdito7YSPy8BSvjhoFmojUUFmbxAXrwqlnD52hVek5cL2Zy BInPerqOLTc7uJahFItLLca0pBhodNFkSgv0o59xkl2m9ENARlfuGX0jpACJICoE7nMh ALJ5Ms/KckKKUfJ+UtiIUdRFKyeTY8k67wCwAOAM8O52m1m1pOngbFNhPJ67sl+ELx+b cvYQCDu1ZNYuMiNUBczr40yRJDOAs6k3X1v/09QQdXe9ThYvtVdDDrsUqqVI126S4/py C3dfoUKXejDPUdcevjRmxuUhMxGi/E9TXqZLMpqOBrCCcyMJ1DqNKZEZzVF60dHX6Bmy PYrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sbA+R1Yy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z30si203453pga.363.2019.06.12.09.19.46; Wed, 12 Jun 2019 09:19:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sbA+R1Yy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730720AbfFLQTp (ORCPT + 30 others); Wed, 12 Jun 2019 12:19:45 -0400 Received: from mail-lj1-f194.google.com ([209.85.208.194]:44865 "EHLO mail-lj1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729732AbfFLQTo (ORCPT ); Wed, 12 Jun 2019 12:19:44 -0400 Received: by mail-lj1-f194.google.com with SMTP id k18so15613172ljc.11 for ; Wed, 12 Jun 2019 09:19:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Me1o0WCLHrdj4pGzYt4+EVkLIwsOiL3bGNYyI4+f4XA=; b=sbA+R1YyTeJkOtusG+mONsqLMlCgE67N74LkOXMJSVZdc1ZcUyjp7BFrdnYC9unTY0 C2/FTSiAh8qCDuX1bUbS2ctJWPKUrL0q0fxQbblOIxqx+XWcwDW/Pw1N6PWmvhBTOw7G wVOUlTHalXYSy5Pu28GzpCxIM68ijW/hBlcT6k5ronpBnUi0/kmkKorTTqzQSqb3GL+x qa9RJ26zUAi0B9NFm8jnmODwJ268IwSL1wPMSpgAaX05fWZWwS7pG7S65CynDIZfmvkD Ll+aTS+sq6csZ3YKF3eCWakpmWBXhAz/Gvqf5mX4cN/KVh9hStUT2QVhfRSaRzgR/oTW udGw== 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:mime-version :content-transfer-encoding; bh=Me1o0WCLHrdj4pGzYt4+EVkLIwsOiL3bGNYyI4+f4XA=; b=fcJXUgWCvfJ+e3Nev8oIEaxLw0nKOb5/F7ObG5Gup5Cu4gdwZceW+czjXUifQbrTXE 8v6Up1K1CGs3iPilSNYpofiZNprBsdnXE93C7C51++dNFm9lx9eplpVsSck8UR2tgavv QQd+dfKsKc25ItlzcDcxe6XPZlKxroY72akSbwO5wjbYMlV/5olo3favpIbOyE4ctJI2 FcJTA/gLux7NsshBEypcEqlAiDoxLmYFpPkkvExfshHhJSMGTS72H+zimESZpcZubl8H Ni9shUxIsZNL72zTndr3KBooCRCeg63sD1tALlVbw7pINSDMmxjPi6RClg11CXdyo4uE M4XA== X-Gm-Message-State: APjAAAUdel4we/8xVJ806IIL6XHy4MKFlvoQpF/GauAVFwS96gSDV/Dz dwXcRl8moFwFgCloPuQIYB3crA== X-Received: by 2002:a2e:989a:: with SMTP id b26mr15046522ljj.31.1560356382037; Wed, 12 Jun 2019 09:19:42 -0700 (PDT) Received: from localhost (c-1c3670d5.07-21-73746f28.bbcust.telenor.se. [213.112.54.28]) by smtp.gmail.com with ESMTPSA id u128sm51319lja.23.2019.06.12.09.19.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 12 Jun 2019 09:19:41 -0700 (PDT) From: Anders Roxell To: mchehab@kernel.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Anders Roxell Subject: [PATCH v3] media: i2c: fix warning same module names Date: Wed, 12 Jun 2019 18:19:35 +0200 Message-Id: <20190612161935.30264-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When building with CONFIG_VIDEO_ADV7511 and CONFIG_DRM_I2C_ADV7511 enabled as loadable modules, we see the following warning: warning: same module names found: drivers/gpu/drm/bridge/adv7511/adv7511.ko drivers/media/i2c/adv7511.ko Rework so that the file is named adv7511-v4l2.c. Signed-off-by: Anders Roxell --- drivers/media/i2c/Makefile | 2 +- drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) rename drivers/media/i2c/{adv7511.c => adv7511-v4l2.c} (99%) -- 2.20.1 diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile index d8ad9dad495d..fd4ea86dedd5 100644 --- a/drivers/media/i2c/Makefile +++ b/drivers/media/i2c/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_VIDEO_ADV748X) += adv748x/ obj-$(CONFIG_VIDEO_ADV7604) += adv7604.o obj-$(CONFIG_VIDEO_ADV7842) += adv7842.o obj-$(CONFIG_VIDEO_AD9389B) += ad9389b.o -obj-$(CONFIG_VIDEO_ADV7511) += adv7511.o +obj-$(CONFIG_VIDEO_ADV7511) += adv7511-v4l2.o obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o obj-$(CONFIG_VIDEO_VS6624) += vs6624.o obj-$(CONFIG_VIDEO_BT819) += bt819.o diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511-v4l2.c similarity index 99% rename from drivers/media/i2c/adv7511.c rename to drivers/media/i2c/adv7511-v4l2.c index cec5ebb1c9e6..2ad6bdf1a9fc 100644 --- a/drivers/media/i2c/adv7511.c +++ b/drivers/media/i2c/adv7511-v4l2.c @@ -5,6 +5,11 @@ * Copyright 2013 Cisco Systems, Inc. and/or its affiliates. All rights reserved. */ +/* + * This file is named adv7511-v4l2.c so it doesn't conflict with the Analog + * Device ADV7511 (config fragment CONFIG_DRM_I2C_ADV7511). + */ + #include #include