diff options
Diffstat (limited to 'sound/soc/codecs/uda1380.c')
-rw-r--r-- | sound/soc/codecs/uda1380.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/codecs/uda1380.c b/sound/soc/codecs/uda1380.c index 2502214b84ab..fd0a314bc209 100644 --- a/sound/soc/codecs/uda1380.c +++ b/sound/soc/codecs/uda1380.c | |||
@@ -795,8 +795,8 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { | |||
795 | }; | 795 | }; |
796 | 796 | ||
797 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 797 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) |
798 | static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, | 798 | static int uda1380_i2c_probe(struct i2c_client *i2c, |
799 | const struct i2c_device_id *id) | 799 | const struct i2c_device_id *id) |
800 | { | 800 | { |
801 | struct uda1380_priv *uda1380; | 801 | struct uda1380_priv *uda1380; |
802 | int ret; | 802 | int ret; |
@@ -814,7 +814,7 @@ static __devinit int uda1380_i2c_probe(struct i2c_client *i2c, | |||
814 | return ret; | 814 | return ret; |
815 | } | 815 | } |
816 | 816 | ||
817 | static int __devexit uda1380_i2c_remove(struct i2c_client *i2c) | 817 | static int uda1380_i2c_remove(struct i2c_client *i2c) |
818 | { | 818 | { |
819 | snd_soc_unregister_codec(&i2c->dev); | 819 | snd_soc_unregister_codec(&i2c->dev); |
820 | return 0; | 820 | return 0; |
@@ -832,7 +832,7 @@ static struct i2c_driver uda1380_i2c_driver = { | |||
832 | .owner = THIS_MODULE, | 832 | .owner = THIS_MODULE, |
833 | }, | 833 | }, |
834 | .probe = uda1380_i2c_probe, | 834 | .probe = uda1380_i2c_probe, |
835 | .remove = __devexit_p(uda1380_i2c_remove), | 835 | .remove = uda1380_i2c_remove, |
836 | .id_table = uda1380_i2c_id, | 836 | .id_table = uda1380_i2c_id, |
837 | }; | 837 | }; |
838 | #endif | 838 | #endif |