From patchwork Tue Apr 16 22:49:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 2451431 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D33A3DF230 for ; Tue, 16 Apr 2013 22:49:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965554Ab3DPWte (ORCPT ); Tue, 16 Apr 2013 18:49:34 -0400 Received: from mx1.redhat.com ([209.132.183.28]:13713 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965528Ab3DPWtd (ORCPT ); Tue, 16 Apr 2013 18:49:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r3GMnXFk016925 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 16 Apr 2013 18:49:33 -0400 Received: from pedra (vpn1-7-94.gru2.redhat.com [10.97.7.94]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r3GMnTHA009599 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 16 Apr 2013 18:49:33 -0400 Received: from v4l by pedra with local (Exim 4.80.1) (envelope-from ) id 1USEgq-0002ju-O1; Tue, 16 Apr 2013 19:49:28 -0300 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Linux Media Mailing List Subject: [PATCH v2] [media] it913x: rename its tuner driver to tuner_it913x Date: Tue, 16 Apr 2013 19:49:27 -0300 Message-Id: <1366152567-10191-1-git-send-email-mchehab@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 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 There are three drivers with *it913x name on it, and they all belong to the same device: a tuner, at it913x.c; a frontend: it913x-fe.c; a bridge: it913x.c, renamed to dvb_usb_it913x by the building system. This is confusing. Even more confusing are the two .c files with the same name under different directories, with different contents and different functions. So, prepend the tuner one. This also breaks the out-of-tree compilation system. Reported-by: Frederic Fays Signed-off-by: Mauro Carvalho Chehab Acked-by: Antti Palosaari Reviewed-by: Antti Palosaari --- v2: use -M to make it easier to review drivers/media/tuners/Makefile | 2 +- drivers/media/tuners/{it913x.c => tuner_it913x.c} | 2 +- drivers/media/tuners/{it913x.h => tuner_it913x.h} | 0 drivers/media/tuners/{it913x_priv.h => tuner_it913x_priv.h} | 2 +- drivers/media/usb/dvb-usb-v2/af9035.h | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename drivers/media/tuners/{it913x.c => tuner_it913x.c} (99%) rename drivers/media/tuners/{it913x.h => tuner_it913x.h} (100%) rename drivers/media/tuners/{it913x_priv.h => tuner_it913x_priv.h} (98%) diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile index f136a6d..2ebe4b7 100644 --- a/drivers/media/tuners/Makefile +++ b/drivers/media/tuners/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_MEDIA_TUNER_TUA9001) += tua9001.o obj-$(CONFIG_MEDIA_TUNER_FC0011) += fc0011.o obj-$(CONFIG_MEDIA_TUNER_FC0012) += fc0012.o obj-$(CONFIG_MEDIA_TUNER_FC0013) += fc0013.o -obj-$(CONFIG_MEDIA_TUNER_IT913X) += it913x.o +obj-$(CONFIG_MEDIA_TUNER_IT913X) += tuner_it913x.o ccflags-y += -I$(srctree)/drivers/media/dvb-core ccflags-y += -I$(srctree)/drivers/media/dvb-frontends diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/tuner_it913x.c similarity index 99% rename from drivers/media/tuners/it913x.c rename to drivers/media/tuners/tuner_it913x.c index 4d7a247..6f30d7e 100644 --- a/drivers/media/tuners/it913x.c +++ b/drivers/media/tuners/tuner_it913x.c @@ -20,7 +20,7 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.= */ -#include "it913x_priv.h" +#include "tuner_it913x_priv.h" struct it913x_state { struct i2c_adapter *i2c_adap; diff --git a/drivers/media/tuners/it913x.h b/drivers/media/tuners/tuner_it913x.h similarity index 100% rename from drivers/media/tuners/it913x.h rename to drivers/media/tuners/tuner_it913x.h diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/tuner_it913x_priv.h similarity index 98% rename from drivers/media/tuners/it913x_priv.h rename to drivers/media/tuners/tuner_it913x_priv.h index 00dcf3c..ce65210 100644 --- a/drivers/media/tuners/it913x_priv.h +++ b/drivers/media/tuners/tuner_it913x_priv.h @@ -23,7 +23,7 @@ #ifndef IT913X_PRIV_H #define IT913X_PRIV_H -#include "it913x.h" +#include "tuner_it913x.h" #include "af9033.h" #define PRO_LINK 0x0 diff --git a/drivers/media/usb/dvb-usb-v2/af9035.h b/drivers/media/usb/dvb-usb-v2/af9035.h index 0f42b6c..b5827ca 100644 --- a/drivers/media/usb/dvb-usb-v2/af9035.h +++ b/drivers/media/usb/dvb-usb-v2/af9035.h @@ -30,7 +30,7 @@ #include "mxl5007t.h" #include "tda18218.h" #include "fc2580.h" -#include "it913x.h" +#include "tuner_it913x.h" struct reg_val { u32 reg;