From patchwork Fri Oct 19 11:43:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 10649059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A170A14E2 for ; Fri, 19 Oct 2018 11:43:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8F13E2879D for ; Fri, 19 Oct 2018 11:43:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 83335288A9; Fri, 19 Oct 2018 11:43:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.2 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_WEB autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 00A4D2879D for ; Fri, 19 Oct 2018 11:43:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727226AbeJSTtZ (ORCPT ); Fri, 19 Oct 2018 15:49:25 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:33250 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727112AbeJSTtZ (ORCPT ); Fri, 19 Oct 2018 15:49:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Sender:Message-Id:Date:Subject:Cc:To: From:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=q7BOrSyDmaENxeUyeJ+BIhFhik3TE3z4dELPdueaouY=; b=G6V0VIvxHUxEk/Nus8ZwtEnJLj NwNpbt7BKbPZK9T4Lk8kyTw9UC/RSrDqCz1oEy9LNMOfxLul+dMsywPzaqNxY3LE10n8fsb8CSfDE 4BU/bqbOSpD3rYbi7+jdj7rbplrcsn7d9BOQ/mn7ekUvVeD8pLdrKiJBIc+PMTN9izqIzK31ckOOq lVgTmWoMttyNSnMQ86BzbQy63YfwHkS+BLht/1lvIvMix/RvODFVzCcvZU+4O19RWYG2NmPlA32mv Znjwn1k1YmL5SVTYfbKu8G44eNbiGNLCJC9XVcr7nHbPebFyRYWR1PfdBGnwsIh6bIE2mFUSPWXyM OgyNdQBw==; Received: from [177.133.17.51] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDTBs-00069n-RJ; Fri, 19 Oct 2018 11:43:40 +0000 Received: from mchehab by bombadil.infradead.org with local (Exim 4.91) (envelope-from ) id 1gDTBp-0001QU-MD; Fri, 19 Oct 2018 07:43:37 -0400 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List , Mauro Carvalho Chehab , Hans Verkuil , Sakari Ailus , Kate Stewart , Philippe Ombredanne , Greg Kroah-Hartman , Jacopo Mondi , Akinobu Mita Subject: [PATCH] media: rename soc_camera I2C drivers Date: Fri, 19 Oct 2018 07:43:36 -0400 Message-Id: <3e42194ffb936ec9d0a4d361f06c6a4b0e88173f.1539949382.git.mchehab+samsung@kernel.org> X-Mailer: git-send-email 2.17.1 To: unlisted-recipients:; (no To-header on input) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Those drivers are part of the legacy SoC camera framework. They're being converted to not use it, but sometimes we're keeping both legacy any new driver. This time, for example, we have two drivers on media with the same name: ov772x. That's bad. So, in order to prevent that to happen, let's prepend the SoC legacy drivers with soc_. No functional changes. Signed-off-by: Mauro Carvalho Chehab Acked-by: Hans Verkuil --- drivers/media/i2c/soc_camera/Makefile | 18 +++++++++--------- .../soc_camera/{mt9m001.c => soc_mt9m001.c} | 0 .../soc_camera/{mt9t112.c => soc_mt9t112.c} | 0 .../soc_camera/{mt9v022.c => soc_mt9v022.c} | 0 .../i2c/soc_camera/{ov5642.c => soc_ov5642.c} | 0 .../i2c/soc_camera/{ov772x.c => soc_ov772x.c} | 0 .../i2c/soc_camera/{ov9640.c => soc_ov9640.c} | 0 .../i2c/soc_camera/{ov9740.c => soc_ov9740.c} | 0 .../{rj54n1cb0c.c => soc_rj54n1cb0c.c} | 0 .../i2c/soc_camera/{tw9910.c => soc_tw9910.c} | 0 10 files changed, 9 insertions(+), 9 deletions(-) rename drivers/media/i2c/soc_camera/{mt9m001.c => soc_mt9m001.c} (100%) rename drivers/media/i2c/soc_camera/{mt9t112.c => soc_mt9t112.c} (100%) rename drivers/media/i2c/soc_camera/{mt9v022.c => soc_mt9v022.c} (100%) rename drivers/media/i2c/soc_camera/{ov5642.c => soc_ov5642.c} (100%) rename drivers/media/i2c/soc_camera/{ov772x.c => soc_ov772x.c} (100%) rename drivers/media/i2c/soc_camera/{ov9640.c => soc_ov9640.c} (100%) rename drivers/media/i2c/soc_camera/{ov9740.c => soc_ov9740.c} (100%) rename drivers/media/i2c/soc_camera/{rj54n1cb0c.c => soc_rj54n1cb0c.c} (100%) rename drivers/media/i2c/soc_camera/{tw9910.c => soc_tw9910.c} (100%) diff --git a/drivers/media/i2c/soc_camera/Makefile b/drivers/media/i2c/soc_camera/Makefile index 8c7770f62997..09ae483b96ef 100644 --- a/drivers/media/i2c/soc_camera/Makefile +++ b/drivers/media/i2c/soc_camera/Makefile @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_SOC_CAMERA_MT9M001) += mt9m001.o -obj-$(CONFIG_SOC_CAMERA_MT9T112) += mt9t112.o -obj-$(CONFIG_SOC_CAMERA_MT9V022) += mt9v022.o -obj-$(CONFIG_SOC_CAMERA_OV5642) += ov5642.o -obj-$(CONFIG_SOC_CAMERA_OV772X) += ov772x.o -obj-$(CONFIG_SOC_CAMERA_OV9640) += ov9640.o -obj-$(CONFIG_SOC_CAMERA_OV9740) += ov9740.o -obj-$(CONFIG_SOC_CAMERA_RJ54N1) += rj54n1cb0c.o -obj-$(CONFIG_SOC_CAMERA_TW9910) += tw9910.o +obj-$(CONFIG_SOC_CAMERA_MT9M001) += soc_mt9m001.o +obj-$(CONFIG_SOC_CAMERA_MT9T112) += soc_mt9t112.o +obj-$(CONFIG_SOC_CAMERA_MT9V022) += soc_mt9v022.o +obj-$(CONFIG_SOC_CAMERA_OV5642) += soc_ov5642.o +obj-$(CONFIG_SOC_CAMERA_OV772X) += soc_ov772x.o +obj-$(CONFIG_SOC_CAMERA_OV9640) += soc_ov9640.o +obj-$(CONFIG_SOC_CAMERA_OV9740) += soc_ov9740.o +obj-$(CONFIG_SOC_CAMERA_RJ54N1) += soc_rj54n1cb0c.o +obj-$(CONFIG_SOC_CAMERA_TW9910) += soc_tw9910.o diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/soc_mt9m001.c similarity index 100% rename from drivers/media/i2c/soc_camera/mt9m001.c rename to drivers/media/i2c/soc_camera/soc_mt9m001.c diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/soc_mt9t112.c similarity index 100% rename from drivers/media/i2c/soc_camera/mt9t112.c rename to drivers/media/i2c/soc_camera/soc_mt9t112.c diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/soc_mt9v022.c similarity index 100% rename from drivers/media/i2c/soc_camera/mt9v022.c rename to drivers/media/i2c/soc_camera/soc_mt9v022.c diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/soc_ov5642.c similarity index 100% rename from drivers/media/i2c/soc_camera/ov5642.c rename to drivers/media/i2c/soc_camera/soc_ov5642.c diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/soc_ov772x.c similarity index 100% rename from drivers/media/i2c/soc_camera/ov772x.c rename to drivers/media/i2c/soc_camera/soc_ov772x.c diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/soc_ov9640.c similarity index 100% rename from drivers/media/i2c/soc_camera/ov9640.c rename to drivers/media/i2c/soc_camera/soc_ov9640.c diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/soc_ov9740.c similarity index 100% rename from drivers/media/i2c/soc_camera/ov9740.c rename to drivers/media/i2c/soc_camera/soc_ov9740.c diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c b/drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c similarity index 100% rename from drivers/media/i2c/soc_camera/rj54n1cb0c.c rename to drivers/media/i2c/soc_camera/soc_rj54n1cb0c.c diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/soc_tw9910.c similarity index 100% rename from drivers/media/i2c/soc_camera/tw9910.c rename to drivers/media/i2c/soc_camera/soc_tw9910.c