projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-6.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave...
[linux-2.6-block.git]
/
drivers
/
mfd
/
da9150-core.c
diff --git
a/drivers/mfd/da9150-core.c
b/drivers/mfd/da9150-core.c
index 6ae56e46d24e6658448fa9fdc60c67581c2d11c7..d2c954103b2f5432eb984df6c7dd0b1ed7f1b40c 100644
(file)
--- a/
drivers/mfd/da9150-core.c
+++ b/
drivers/mfd/da9150-core.c
@@
-392,8
+392,7
@@
static struct mfd_cell da9150_devs[] = {
},
};
},
};
-static int da9150_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int da9150_probe(struct i2c_client *client)
{
struct da9150 *da9150;
struct da9150_pdata *pdata = dev_get_platdata(&client->dev);
{
struct da9150 *da9150;
struct da9150_pdata *pdata = dev_get_platdata(&client->dev);
@@
-511,7
+510,7
@@
static struct i2c_driver da9150_driver = {
.name = "da9150",
.of_match_table = da9150_of_match,
},
.name = "da9150",
.of_match_table = da9150_of_match,
},
- .probe
= da9150_probe,
+ .probe
_new
= da9150_probe,
.remove = da9150_remove,
.shutdown = da9150_shutdown,
.id_table = da9150_i2c_id,
.remove = da9150_remove,
.shutdown = da9150_shutdown,
.id_table = da9150_i2c_id,