From patchwork Sun Mar 8 14:37:58 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 5962191 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 67CC2BF440 for ; Sun, 8 Mar 2015 14:43:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 731FF202E6 for ; Sun, 8 Mar 2015 14:43:41 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 1D09320218 for ; Sun, 8 Mar 2015 14:43:40 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 2A19726058E; Sun, 8 Mar 2015 15:43:38 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 260E3260455; Sun, 8 Mar 2015 15:41:43 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id CCA1F2604DE; Sun, 8 Mar 2015 15:41:41 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by alsa0.perex.cz (Postfix) with ESMTP id B493026044F for ; Sun, 8 Mar 2015 15:41:32 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP; 08 Mar 2015 07:39:54 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,362,1422950400"; d="scan'208";a="464251133" Received: from vkoul-udesk3.iind.intel.com ([10.223.84.65]) by FMSMGA003.fm.intel.com with ESMTP; 08 Mar 2015 07:34:56 -0700 From: Vinod Koul To: alsa-devel@alsa-project.org Date: Sun, 8 Mar 2015 20:07:58 +0530 Message-Id: <1425825479-28780-5-git-send-email-vinod.koul@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1425825479-28780-1-git-send-email-vinod.koul@intel.com> References: <1425825479-28780-1-git-send-email-vinod.koul@intel.com> Cc: tiwai@suse.de, Jeeja KP , Vinod Koul , lgirdwood@gmail.com, Hardik T Shah Subject: [alsa-devel] [RFC 4/5] ALSA: hda: rename sound/hda/hda* as sound/hda/hdalib X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeeja KP The hda common library will eventually have name space conflicts with other code, so start moving the common code to use hdalib names, so we willr eplace all common code from snd_hda_* to snd_hdalib_* Signed-off-by: Jeeja KP Signed-off-by: Hardik T Shah Signed-off-by: Vinod Koul --- sound/hda/Makefile | 27 ++++++++++---------- .../{hda_auto_parser.c => hdalib_auto_parser.c} | 0 sound/hda/{hda_beep.c => hdalib_beep.c} | 0 sound/hda/{hda_codec.c => hdalib_codec.c} | 0 .../hda/{hda_controller.c => hdalib_controller.c} | 0 sound/hda/{hda_eld.c => hdalib_eld.c} | 0 sound/hda/{hda_generic.c => hdalib_generic.c} | 0 sound/hda/{hda_hwdep.c => hdalib_hwdep.c} | 0 sound/hda/{hda_jack.c => hdalib_jack.c} | 0 sound/hda/{hda_proc.c => hdalib_proc.c} | 0 sound/hda/{hda_sysfs.c => hdalib_sysfs.c} | 0 11 files changed, 14 insertions(+), 13 deletions(-) rename sound/hda/{hda_auto_parser.c => hdalib_auto_parser.c} (100%) rename sound/hda/{hda_beep.c => hdalib_beep.c} (100%) rename sound/hda/{hda_codec.c => hdalib_codec.c} (100%) rename sound/hda/{hda_controller.c => hdalib_controller.c} (100%) rename sound/hda/{hda_eld.c => hdalib_eld.c} (100%) rename sound/hda/{hda_generic.c => hdalib_generic.c} (100%) rename sound/hda/{hda_hwdep.c => hdalib_hwdep.c} (100%) rename sound/hda/{hda_jack.c => hdalib_jack.c} (100%) rename sound/hda/{hda_proc.c => hdalib_proc.c} (100%) rename sound/hda/{hda_sysfs.c => hdalib_sysfs.c} (100%) diff --git a/sound/hda/hda_auto_parser.c b/sound/hda/hdalib_auto_parser.c similarity index 100% rename from sound/hda/hda_auto_parser.c rename to sound/hda/hdalib_auto_parser.c diff --git a/sound/hda/hda_beep.c b/sound/hda/hdalib_beep.c similarity index 100% rename from sound/hda/hda_beep.c rename to sound/hda/hdalib_beep.c diff --git a/sound/hda/hda_codec.c b/sound/hda/hdalib_codec.c similarity index 100% rename from sound/hda/hda_codec.c rename to sound/hda/hdalib_codec.c diff --git a/sound/hda/hda_controller.c b/sound/hda/hdalib_controller.c similarity index 100% rename from sound/hda/hda_controller.c rename to sound/hda/hdalib_controller.c diff --git a/sound/hda/hda_eld.c b/sound/hda/hdalib_eld.c similarity index 100% rename from sound/hda/hda_eld.c rename to sound/hda/hdalib_eld.c diff --git a/sound/hda/hda_generic.c b/sound/hda/hdalib_generic.c similarity index 100% rename from sound/hda/hda_generic.c rename to sound/hda/hdalib_generic.c diff --git a/sound/hda/hda_hwdep.c b/sound/hda/hdalib_hwdep.c similarity index 100% rename from sound/hda/hda_hwdep.c rename to sound/hda/hdalib_hwdep.c diff --git a/sound/hda/hda_jack.c b/sound/hda/hdalib_jack.c similarity index 100% rename from sound/hda/hda_jack.c rename to sound/hda/hdalib_jack.c diff --git a/sound/hda/hda_proc.c b/sound/hda/hdalib_proc.c similarity index 100% rename from sound/hda/hda_proc.c rename to sound/hda/hdalib_proc.c diff --git a/sound/hda/hda_sysfs.c b/sound/hda/hdalib_sysfs.c similarity index 100% rename from sound/hda/hda_sysfs.c rename to sound/hda/hdalib_sysfs.c diff --git a/sound/hda/Makefile b/sound/hda/Makefile index 6862de9bcbb6..ae57a6a6c40d 100644 --- a/sound/hda/Makefile +++ b/sound/hda/Makefile @@ -1,20 +1,21 @@ -snd-hda-controller-objs := hda_controller.o -snd-hda-codec-y := hda_codec.o hda_jack.o hda_auto_parser.o \ - hda_eld.o hda_sysfs.o - -snd-hda-codec-$(CONFIG_PROC_FS) += hda_proc.o -snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o -snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o +ccflags-y += -Werror +ccflags-y += -DDEBUG +snd-hdalib-controller-objs := hdalib_controller.o +snd-hdalib-codec-y := hdalib_codec.o hdalib_jack.o hdalib_auto_parser.o \ +hdalib_eld.o hdalib_sysfs.o +snd-hdalib-codec-$(CONFIG_PROC_FS) += hdalib_proc.o +snd-hdalib-codec-$(CONFIG_SND_HDA_HWDEP) += hdalib_hwdep.o +snd-hdalib-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hdalib_beep.o # for trace-points -CFLAGS_hda_controller.o := -I$(src) -CFLAGS_hda_codec.o := -I$(src) +CFLAGS_hdalib_controller.o := -I$(src) +CFLAGS_hdalib_codec.o := -I$(src) -snd-hda-codec-generic-objs := hda_generic.o +snd-hdalib-codec-generic-objs := hdalib_generic.o # common driver -obj-$(CONFIG_SND_CORE_HDA) += snd-hda-codec.o -obj-$(CONFIG_SND_CORE_HDA) += snd-hda-controller.o +obj-$(CONFIG_SND_CORE_HDA) += snd-hdalib-codec.o +obj-$(CONFIG_SND_CORE_HDA) += snd-hdalib-controller.o # codec drivers -obj-$(CONFIG_SND_CORE_HDA_GENERIC) += snd-hda-codec-generic.o +obj-$(CONFIG_SND_CORE_HDA_GENERIC) += snd-hdalib-codec-generic.o