From: Marcus Cooper <codekip...@gmail.com> There is a lot of code in the HDMI driver that does nothing. This patch removes all the headers which are deemed unnecessary.
Signed-off-by: Marcus Cooper <codekip...@gmail.com> --- sound/soc/sunxi/hdmiaudio/sndhdmi.c | 3 +-- sound/soc/sunxi/hdmiaudio/sndhdmi.h | 36 ----------------------------- sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c | 1 - sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c | 1 - sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.h | 25 -------------------- sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.c | 3 --- sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.h | 26 --------------------- 7 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 sound/soc/sunxi/hdmiaudio/sndhdmi.h delete mode 100644 sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.h delete mode 100644 sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.h diff --git a/sound/soc/sunxi/hdmiaudio/sndhdmi.c b/sound/soc/sunxi/hdmiaudio/sndhdmi.c index f291c4b..87080bd 100644 --- a/sound/soc/sunxi/hdmiaudio/sndhdmi.c +++ b/sound/soc/sunxi/hdmiaudio/sndhdmi.c @@ -22,8 +22,7 @@ #include <sound/initval.h> #include <plat/sys_config.h> #include <linux/io.h> - -#include "sndhdmi.h" +#include <linux/drv_hdmi.h> struct sndhdmi_priv { int sysclk; diff --git a/sound/soc/sunxi/hdmiaudio/sndhdmi.h b/sound/soc/sunxi/hdmiaudio/sndhdmi.h deleted file mode 100644 index 346e587..0000000 --- a/sound/soc/sunxi/hdmiaudio/sndhdmi.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * sound\soc\sunxi\hdmiaudio\sndhdmi.h - * (C) Copyright 2007-2011 - * Allwinner Technology Co., Ltd. <www.allwinnertech.com> - * chenpailin <chenpai...@allwinnertech.com> - * - * some simple description for this code - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - */ -#ifndef SNDHDMI_H -#define SNDHDMI_H -#include <linux/drv_hdmi.h> - -struct sndhdmi_platform_data { - void (*power) (int); - int model; - /* - ALSA SOC usually puts the device in standby mode when it's not used - for sometime. If you unset is_powered_on_standby the driver will - turn off the ADC/DAC when this callback is invoked and turn it back - on when needed. Unfortunately this will result in a very light bump - (it can be audible only with good earphones). If this bothers you - set is_powered_on_standby, you will have slightly higher power - consumption. Please note that sending the L3 command for ADC is - enough to make the bump, so it doesn't make difference if you - completely take off power from the codec. - */ - int is_powered_on_standby; -}; - -#endif diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c b/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c index 5080f10..a678fb9 100644 --- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c +++ b/sound/soc/sunxi/hdmiaudio/sunxi-hdmiaudio.c @@ -34,7 +34,6 @@ #include <plat/sys_config.h> #include <plat/dma_compat.h> -#include "sunxi-hdmipcm.h" #include "sunxi-hdmiaudio.h" //save the register value diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c index 08221d2..d8e3298 100644 --- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c +++ b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.c @@ -30,7 +30,6 @@ #include <plat/dma_compat.h> #include "sunxi-hdmiaudio.h" -#include "sunxi-hdmipcm.h" static volatile unsigned int dmasrc = 0; static volatile unsigned int dmadst = 0; diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.h b/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.h deleted file mode 100644 index 0649177..0000000 --- a/sound/soc/sunxi/hdmiaudio/sunxi-hdmipcm.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * sound\soc\sunxi\hdmiaudio\sunxi-hdmipcm.h - * (C) Copyright 2007-2011 - * Allwinner Technology Co., Ltd. <www.allwinnertech.com> - * chenpailin <chenpai...@allwinnertech.com> - * - * some simple description for this code - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - */ - -#ifndef SUNXI_HDMIPCM_H_ -#define SUNXI_HDMIPCM_H_ - -enum sunxi_dma_buffresult { - SUNXI_RES_OK, - SUNXI_RES_ERR, - SUNXI_RES_ABORT -}; - -#endif //SUNXI_HDMIPCM_H_ diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.c b/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.c index c89f760..2d29ad9 100644 --- a/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.c +++ b/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.c @@ -25,9 +25,6 @@ #include <linux/io.h> #include "sunxi-hdmiaudio.h" -#include "sunxi-hdmipcm.h" - -#include "sndhdmi.h" static struct clk *xtal; diff --git a/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.h b/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.h deleted file mode 100644 index 341aee9..0000000 --- a/sound/soc/sunxi/hdmiaudio/sunxi-sndhdmi.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * sound\soc\sunxi\hdmiaudio\sunxi-sndhdmi.h - * (C) Copyright 2007-2011 - * Allwinner Technology Co., Ltd. <www.allwinnertech.com> - * chenpailin <chenpai...@allwinnertech.com> - * - * some simple description for this code - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - */ - -#ifndef SUNXI_SNDHDMI_H_ -#define SUNXI_SNDHDMI_H_ - -struct sunxi_sndhdmi_platform_data { - int hdmiaudio_bclk; - int hdmiaudio_ws; - int hdmiaudio_data; - void (*power)(int); - int model; -} -#endif -- 1.8.3.2 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.