summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-09 20:13:47 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2009-10-09 20:13:47 +0200
commitebab1b1d07266ab8ca9f65065e68b02f05504c4e (patch)
tree53a1de5734fa2e8ccacd15d75dd71f052d148903 /sound
parentASoC: TPA6130A2 amplifier driver (diff)
downloadlinux-ebab1b1d07266ab8ca9f65065e68b02f05504c4e.tar.xz
linux-ebab1b1d07266ab8ca9f65065e68b02f05504c4e.zip
ASoC: Minor fixups to tpa6130a2 driver
- Staticise ttpa6130a2_client. - Remove unneeded cast from void. - Use explict NULL rather than 0. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/tpa6130a2.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/tpa6130a2.c b/sound/soc/codecs/tpa6130a2.c
index 1b77c959e2dc..0a6e7b4ace60 100644
--- a/sound/soc/codecs/tpa6130a2.c
+++ b/sound/soc/codecs/tpa6130a2.c
@@ -32,7 +32,7 @@
#include "tpa6130a2.h"
-struct i2c_client *tpa6130a2_client;
+static struct i2c_client *tpa6130a2_client;
/* This struct is used to save the context */
struct tpa6130a2_data {
@@ -372,7 +372,7 @@ static int tpa6130a2_probe(struct i2c_client *client,
i2c_set_clientdata(tpa6130a2_client, data);
- pdata = (struct tpa6130a2_platform_data *)client->dev.platform_data;
+ pdata = client->dev.platform_data;
data->power_gpio = pdata->power_gpio;
mutex_init(&data->mutex);
@@ -410,7 +410,7 @@ static int tpa6130a2_probe(struct i2c_client *client,
fail:
kfree(data);
i2c_set_clientdata(tpa6130a2_client, NULL);
- tpa6130a2_client = 0;
+ tpa6130a2_client = NULL;
return ret;
}
@@ -424,7 +424,7 @@ static int tpa6130a2_remove(struct i2c_client *client)
if (data->power_gpio >= 0)
gpio_free(data->power_gpio);
kfree(data);
- tpa6130a2_client = 0;
+ tpa6130a2_client = NULL;
return 0;
}