diff mbox

[v1] ALSA: atmel: Remove leftovers of AVR32 removal

Message ID 20170901151815.56642-1-andriy.shevchenko@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Andy Shevchenko Sept. 1, 2017, 3:18 p.m. UTC 
The ALSA related include header files are left overs after the commit

	020c5260c2b1 ("ALSA: atmel: Remove AVR32 bits from the driver")

Fixes: 020c5260c2b1 ("ALSA: atmel: Remove AVR32 bits from the driver")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 include/sound/atmel-abdac.h | 23 -----------------------
 include/sound/atmel-ac97c.h | 38 --------------------------------------
 sound/atmel/ac97c.c         |  1 -
 3 files changed, 62 deletions(-)
 delete mode 100644 include/sound/atmel-abdac.h
 delete mode 100644 include/sound/atmel-ac97c.h

Comments

Takashi Iwai Sept. 1, 2017, 3:27 p.m. UTC | #1 
On Fri, 01 Sep 2017 17:18:15 +0200,
Andy Shevchenko wrote:
> 
> The ALSA related include header files are left overs after the commit
> 
> 	020c5260c2b1 ("ALSA: atmel: Remove AVR32 bits from the driver")
> 
> Fixes: 020c5260c2b1 ("ALSA: atmel: Remove AVR32 bits from the driver")
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

Applied, thanks.


Takashi
Andy Shevchenko Sept. 1, 2017, 3:36 p.m. UTC | #2 
On Fri, 2017-09-01 at 17:27 +0200, Takashi Iwai wrote:
> On Fri, 01 Sep 2017 17:18:15 +0200,
> Andy Shevchenko wrote:
> > 
> > The ALSA related include header files are left overs after the
> > commit
> > 
> > 	020c5260c2b1 ("ALSA: atmel: Remove AVR32 bits from the driver")
> > 
> > Fixes: 020c5260c2b1 ("ALSA: atmel: Remove AVR32 bits from the
> > driver")
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> 
> Applied, thanks.

Sorry, it seems a not enough version. 
I'm going to send a v2.
diff mbox

Patch

diff --git a/include/sound/atmel-abdac.h b/include/sound/atmel-abdac.h
deleted file mode 100644
index a8f735d677fa..000000000000
--- a/include/sound/atmel-abdac.h
+++ /dev/null
@@ -1,23 +0,0 @@ 
-/*
- * Driver for the Atmel Audio Bitstream DAC (ABDAC)
- *
- * Copyright (C) 2009 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-#ifndef __INCLUDE_SOUND_ATMEL_ABDAC_H
-#define __INCLUDE_SOUND_ATMEL_ABDAC_H
-
-#include <linux/platform_data/dma-dw.h>
-
-/**
- * struct atmel_abdac_pdata - board specific ABDAC configuration
- * @dws: DMA slave interface to use for sound playback.
- */
-struct atmel_abdac_pdata {
-	struct dw_dma_slave	dws;
-};
-
-#endif /* __INCLUDE_SOUND_ATMEL_ABDAC_H */
diff --git a/include/sound/atmel-ac97c.h b/include/sound/atmel-ac97c.h
deleted file mode 100644
index f2a1cdc37661..000000000000
--- a/include/sound/atmel-ac97c.h
+++ /dev/null
@@ -1,38 +0,0 @@ 
-/*
- * Driver for the Atmel AC97C controller
- *
- * Copyright (C) 2005-2009 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation.
- */
-#ifndef __INCLUDE_SOUND_ATMEL_AC97C_H
-#define __INCLUDE_SOUND_ATMEL_AC97C_H
-
-#include <linux/platform_data/dma-dw.h>
-
-#define AC97C_CAPTURE	0x01
-#define AC97C_PLAYBACK	0x02
-#define AC97C_BOTH	(AC97C_CAPTURE | AC97C_PLAYBACK)
-
-/**
- * struct atmel_ac97c_pdata - board specific AC97C configuration
- * @rx_dws: DMA slave interface to use for sound capture.
- * @tx_dws: DMA slave interface to use for sound playback.
- * @reset_pin: GPIO pin wired to the reset input on the external AC97 codec,
- *             optional to use, set to -ENODEV if not in use. AC97 layer will
- *             try to do a software reset of the external codec anyway.
- *
- * If the user do not want to use a DMA channel for playback or capture, i.e.
- * only one feature is required on the board. The slave for playback or capture
- * can be set to NULL. The AC97C driver will take use of this when setting up
- * the sound streams.
- */
-struct ac97c_platform_data {
-	struct dw_dma_slave	rx_dws;
-	struct dw_dma_slave	tx_dws;
-	int			reset_pin;
-};
-
-#endif /* __INCLUDE_SOUND_ATMEL_AC97C_H */
diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index 5ffefac2fa8f..6d085e1d1d0a 100644
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -29,7 +29,6 @@ 
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/ac97_codec.h>
-#include <sound/atmel-ac97c.h>
 #include <sound/memalloc.h>
 
 #include "ac97c.h"