aboutsummaryrefslogtreecommitdiff
path: root/drivers/sound
diff options
context:
space:
mode:
authorSimon Glass2018-12-03 04:37:22 -0700
committerSimon Glass2018-12-13 16:32:49 -0700
commitccf0425e3208cbc17f08411651c1197da3b38f3a (patch)
tree76a2c8e302615ee7e7f42c2c11de979b48986730 /drivers/sound
parentd2eab333a7fe83eb6bfcc1b4b8a522ce1aa4d761 (diff)
dm: sound: samsung: Rename i2stx_info to samsung_i2s_priv
This struct is only used by the Samsung I2C driver and should move into that driver. For now, rename it so it is clear that is driver-private info. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers/sound')
-rw-r--r--drivers/sound/samsung-i2s.c6
-rw-r--r--drivers/sound/sound-i2s.c10
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/sound/samsung-i2s.c b/drivers/sound/samsung-i2s.c
index 8f5cd191a2b..7f4388137a5 100644
--- a/drivers/sound/samsung-i2s.c
+++ b/drivers/sound/samsung-i2s.c
@@ -255,8 +255,8 @@ static int i2s_set_samplesize(struct i2s_reg *i2s_reg, unsigned int blc)
return 0;
}
-int i2s_transfer_tx_data(struct i2stx_info *pi2s_tx, unsigned int *data,
- unsigned long data_size)
+int i2s_transfer_tx_data(struct samsung_i2s_priv *pi2s_tx, unsigned int *data,
+ unsigned long data_size)
{
int i;
int start;
@@ -293,7 +293,7 @@ int i2s_transfer_tx_data(struct i2stx_info *pi2s_tx, unsigned int *data,
return 0;
}
-int i2s_tx_init(struct i2stx_info *pi2s_tx)
+int i2s_tx_init(struct samsung_i2s_priv *pi2s_tx)
{
int ret;
struct i2s_reg *i2s_reg =
diff --git a/drivers/sound/sound-i2s.c b/drivers/sound/sound-i2s.c
index f0f0b79bc52..106842a23db 100644
--- a/drivers/sound/sound-i2s.c
+++ b/drivers/sound/sound-i2s.c
@@ -20,15 +20,15 @@
#define SOUND_400_HZ 400
#define SOUND_BITS_IN_BYTE 8
-static struct i2stx_info g_i2stx_pri;
+static struct samsung_i2s_priv g_i2stx_pri;
/*
* get_sound_i2s_values gets values for i2s parameters
*
- * @param i2stx_info i2s transmitter transfer param structure
+ * @param samsung_i2s_priv i2s transmitter transfer param structure
* @param blob FDT blob if enabled else NULL
*/
-static int get_sound_i2s_values(struct i2stx_info *i2s, const void *blob)
+static int get_sound_i2s_values(struct samsung_i2s_priv *i2s, const void *blob)
{
int node;
int error = 0;
@@ -97,7 +97,7 @@ static int get_sound_i2s_values(struct i2stx_info *i2s, const void *blob)
* @param pi2s_tx i2s parameters required by codec
* @return int value, 0 for success
*/
-static int codec_init(const void *blob, struct i2stx_info *pi2s_tx)
+static int codec_init(const void *blob, struct samsung_i2s_priv *pi2s_tx)
{
int ret;
const char *codectype;
@@ -145,7 +145,7 @@ static int codec_init(const void *blob, struct i2stx_info *pi2s_tx)
int sound_init(const void *blob)
{
int ret;
- struct i2stx_info *pi2s_tx = &g_i2stx_pri;
+ struct samsung_i2s_priv *pi2s_tx = &g_i2stx_pri;
/* Get the I2S Values */
if (get_sound_i2s_values(pi2s_tx, blob) < 0) {