Diff
Modified: trunk/sound/soc/blackfin/bf5xx-i2s.c (9794 => 9795)
--- trunk/sound/soc/blackfin/bf5xx-i2s.c 2011-03-28 06:48:11 UTC (rev 9794)
+++ trunk/sound/soc/blackfin/bf5xx-i2s.c 2011-03-28 06:49:33 UTC (rev 9795)
@@ -30,7 +30,6 @@
#include <linux/module.h>
#include <linux/device.h>
#include <linux/delay.h>
-#include <linux/slab.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -173,6 +172,7 @@
static int bf5xx_i2s_suspend(struct snd_soc_dai *dai)
{
struct sport_device *sport_handle = snd_soc_dai_get_drvdata(dai);
+
pr_debug("%s : sport %d\n", __func__, dai->id);
if (dai->capture_active)
@@ -283,8 +283,8 @@
.probe = bf5xx_i2s_probe,
.remove = __devexit_p(bf5xx_i2s_remove),
.driver = {
- .name = "bfin-i2s",
- .owner = THIS_MODULE,
+ .name = "bfin-i2s",
+ .owner = THIS_MODULE,
},
};
@@ -305,3 +305,4 @@
MODULE_AUTHOR("Cliff Cai");
MODULE_DESCRIPTION("I2S driver for ADI Blackfin");
MODULE_LICENSE("GPL");
+
Modified: trunk/sound/soc/blackfin/bf5xx-sport.c (9794 => 9795)
--- trunk/sound/soc/blackfin/bf5xx-sport.c 2011-03-28 06:48:11 UTC (rev 9794)
+++ trunk/sound/soc/blackfin/bf5xx-sport.c 2011-03-28 06:49:33 UTC (rev 9795)
@@ -39,7 +39,6 @@
#include <asm/cacheflush.h>
#include "bf5xx-sport.h"
-
/* delay between frame sync pulse and first data bit in multichannel mode */
#define FRAME_DELAY (1<<12)
Modified: trunk/sound/soc/blackfin/bf5xx-sport.h (9794 => 9795)
--- trunk/sound/soc/blackfin/bf5xx-sport.h 2011-03-28 06:48:11 UTC (rev 9794)
+++ trunk/sound/soc/blackfin/bf5xx-sport.h 2011-03-28 06:49:33 UTC (rev 9795)
@@ -171,5 +171,4 @@
int sport_send_and_recv(struct sport_device *sport, u8 *out_data, \
u8 *in_data, int len);
-
#endif /* BF53X_SPORT_H */
Modified: trunk/sound/soc/blackfin/bf5xx-tdm.c (9794 => 9795)
--- trunk/sound/soc/blackfin/bf5xx-tdm.c 2011-03-28 06:48:11 UTC (rev 9794)
+++ trunk/sound/soc/blackfin/bf5xx-tdm.c 2011-03-28 06:49:33 UTC (rev 9795)
@@ -32,7 +32,6 @@
#include <linux/init.h>
#include <linux/module.h>
#include <linux/device.h>
-#include <linux/slab.h>
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
@@ -43,7 +42,6 @@
#include <asm/portmux.h>
#include <linux/mutex.h>
#include <linux/gpio.h>
-#include <asm/portmux.h>
#include "bf5xx-sport.h"
#include "bf5xx-tdm.h"
@@ -86,7 +84,6 @@
{
struct sport_device *sport_handle = snd_soc_dai_get_drvdata(dai);
struct bf5xx_tdm_port *bf5xx_tdm = sport_handle->private_data;
-
int ret = 0;
bf5xx_tdm->tcr2 &= ~0x1f;
@@ -190,9 +187,7 @@
if (dai->capture_active)
sport_rx_stop(sport);
- /*
- * isolate sync/clock pins from codec while sports resume
- */
+ /* isolate sync/clock pins from codec while sports resume */
peripheral_free_list(sport->pin_req);
return 0;
@@ -231,10 +226,6 @@
#define bf5xx_tdm_resume NULL
#endif
-#define BF5XX_TDM_RATES SNDRV_PCM_RATE_48000
-
-#define BF5XX_TDM_FORMATS SNDRV_PCM_FMTBIT_S32_LE
-
static struct snd_soc_dai_ops bf5xx_tdm_dai_ops = {
.hw_params = bf5xx_tdm_hw_params,
.set_fmt = bf5xx_tdm_set_dai_fmt,
@@ -248,13 +239,13 @@
.playback = {
.channels_min = 2,
.channels_max = 8,
- .rates = BF5XX_TDM_RATES,
- .formats = BF5XX_TDM_FORMATS,},
+ .rates = SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S32_LE,},
.capture = {
.channels_min = 2,
.channels_max = 8,
- .rates = BF5XX_TDM_RATES,
- .formats = BF5XX_TDM_FORMATS,},
+ .rates = SNDRV_PCM_RATE_48000,
+ .formats = SNDRV_PCM_FMTBIT_S32_LE,},
.ops = &bf5xx_tdm_dai_ops,
};
