Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 342976
b: refs/heads/master
c: bd479f6
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Mark Brown committed Dec 9, 2012
1 parent 2e16b64 commit bafd567
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c88f3de8555486706c87f5f34f9b45e4c4826283
refs/heads/master: bd479f6f5f5dc2a54bc2cc658c310ed8ad2228a9
8 changes: 4 additions & 4 deletions trunk/sound/soc/codecs/lm49453.c
Original file line number Diff line number Diff line change
Expand Up @@ -1483,8 +1483,8 @@ static const struct regmap_config lm49453_regmap_config = {
.cache_type = REGCACHE_RBTREE,
};

static __devinit int lm49453_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
static int lm49453_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
struct lm49453_priv *lm49453;
int ret = 0;
Expand Down Expand Up @@ -1514,7 +1514,7 @@ static __devinit int lm49453_i2c_probe(struct i2c_client *i2c,
return ret;
}

static int __devexit lm49453_i2c_remove(struct i2c_client *client)
static int lm49453_i2c_remove(struct i2c_client *client)
{
snd_soc_unregister_codec(&client->dev);
return 0;
Expand All @@ -1532,7 +1532,7 @@ static struct i2c_driver lm49453_i2c_driver = {
.owner = THIS_MODULE,
},
.probe = lm49453_i2c_probe,
.remove = __devexit_p(lm49453_i2c_remove),
.remove = lm49453_i2c_remove,
.id_table = lm49453_i2c_id,
};

Expand Down

0 comments on commit bafd567

Please sign in to comment.