Commit ebab1b1d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Minor fixups to tpa6130a2 driver



- Staticise ttpa6130a2_client.
- Remove unneeded cast from void.
- Use explict NULL rather than 0.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 493b67ef
Loading
Loading
Loading
Loading
+4 −4
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@


#include "tpa6130a2.h"
#include "tpa6130a2.h"


struct i2c_client *tpa6130a2_client;
static struct i2c_client *tpa6130a2_client;


/* This struct is used to save the context */
/* This struct is used to save the context */
struct tpa6130a2_data {
struct tpa6130a2_data {
@@ -372,7 +372,7 @@ static int tpa6130a2_probe(struct i2c_client *client,


	i2c_set_clientdata(tpa6130a2_client, data);
	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;
	data->power_gpio = pdata->power_gpio;


	mutex_init(&data->mutex);
	mutex_init(&data->mutex);
@@ -410,7 +410,7 @@ static int tpa6130a2_probe(struct i2c_client *client,
fail:
fail:
	kfree(data);
	kfree(data);
	i2c_set_clientdata(tpa6130a2_client, NULL);
	i2c_set_clientdata(tpa6130a2_client, NULL);
	tpa6130a2_client = 0;
	tpa6130a2_client = NULL;


	return ret;
	return ret;
}
}
@@ -424,7 +424,7 @@ static int tpa6130a2_remove(struct i2c_client *client)
	if (data->power_gpio >= 0)
	if (data->power_gpio >= 0)
		gpio_free(data->power_gpio);
		gpio_free(data->power_gpio);
	kfree(data);
	kfree(data);
	tpa6130a2_client = 0;
	tpa6130a2_client = NULL;


	return 0;
	return 0;
}
}