summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-16 22:52:44 -0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-16 23:04:43 -0800
commitb08c576434211f2e908f37844dc61ec6e0e1ecec (patch)
treea150f0a397b9ec5a82d1d14e7f9fd88839423ad5 /sound/soc/codecs
parentd69280be4160963796f3a899722c126ab4889f02 (diff)
downloadop-kernel-dev-b08c576434211f2e908f37844dc61ec6e0e1ecec.zip
op-kernel-dev-b08c576434211f2e908f37844dc61ec6e0e1ecec.tar.gz
ASoC: ak4535: Make I2C usage unconditional
Convert to module_i2c_driver() too. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r--sound/soc/codecs/ak4535.c24
1 files changed, 1 insertions, 23 deletions
diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 29d4dec..71fca53 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -409,7 +409,6 @@ static struct snd_soc_codec_driver soc_codec_dev_ak4535 = {
.num_dapm_routes = ARRAY_SIZE(ak4535_audio_map),
};
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
static __devinit int ak4535_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -450,29 +449,8 @@ static struct i2c_driver ak4535_i2c_driver = {
.remove = __devexit_p(ak4535_i2c_remove),
.id_table = ak4535_i2c_id,
};
-#endif
-static int __init ak4535_modinit(void)
-{
- int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- ret = i2c_add_driver(&ak4535_i2c_driver);
- if (ret != 0) {
- printk(KERN_ERR "Failed to register AK4535 I2C driver: %d\n",
- ret);
- }
-#endif
- return ret;
-}
-module_init(ak4535_modinit);
-
-static void __exit ak4535_exit(void)
-{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
- i2c_del_driver(&ak4535_i2c_driver);
-#endif
-}
-module_exit(ak4535_exit);
+module_i2c_driver(ak4535_i2c_driver);
MODULE_DESCRIPTION("Soc AK4535 driver");
MODULE_AUTHOR("Richard Purdie");
OpenPOWER on IntegriCloud