Commit 03279634 authored by Richard Leitner's avatar Richard Leitner Committed by Alexandre Belloni

rtc: s35390a: introduce struct device in probe

To simplify access and shorten code introduce a struct device pointer in
the s35390a probe function.
Signed-off-by: default avatarRichard Leitner <richard.leitner@skidata.com>
Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent c0e12848
...@@ -436,14 +436,14 @@ static int s35390a_probe(struct i2c_client *client, ...@@ -436,14 +436,14 @@ static int s35390a_probe(struct i2c_client *client,
unsigned int i; unsigned int i;
struct s35390a *s35390a; struct s35390a *s35390a;
char buf, status1; char buf, status1;
struct device *dev = &client->dev;
if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
err = -ENODEV; err = -ENODEV;
goto exit; goto exit;
} }
s35390a = devm_kzalloc(&client->dev, sizeof(struct s35390a), s35390a = devm_kzalloc(dev, sizeof(struct s35390a), GFP_KERNEL);
GFP_KERNEL);
if (!s35390a) { if (!s35390a) {
err = -ENOMEM; err = -ENOMEM;
goto exit; goto exit;
...@@ -457,8 +457,8 @@ static int s35390a_probe(struct i2c_client *client, ...@@ -457,8 +457,8 @@ static int s35390a_probe(struct i2c_client *client,
s35390a->client[i] = i2c_new_dummy(client->adapter, s35390a->client[i] = i2c_new_dummy(client->adapter,
client->addr + i); client->addr + i);
if (!s35390a->client[i]) { if (!s35390a->client[i]) {
dev_err(&client->dev, "Address %02x unavailable\n", dev_err(dev, "Address %02x unavailable\n",
client->addr + i); client->addr + i);
err = -EBUSY; err = -EBUSY;
goto exit_dummy; goto exit_dummy;
} }
...@@ -467,7 +467,7 @@ static int s35390a_probe(struct i2c_client *client, ...@@ -467,7 +467,7 @@ static int s35390a_probe(struct i2c_client *client,
err_read = s35390a_read_status(s35390a, &status1); err_read = s35390a_read_status(s35390a, &status1);
if (err_read < 0) { if (err_read < 0) {
err = err_read; err = err_read;
dev_err(&client->dev, "error resetting chip\n"); dev_err(dev, "error resetting chip\n");
goto exit_dummy; goto exit_dummy;
} }
...@@ -481,22 +481,21 @@ static int s35390a_probe(struct i2c_client *client, ...@@ -481,22 +481,21 @@ static int s35390a_probe(struct i2c_client *client,
buf = 0; buf = 0;
err = s35390a_set_reg(s35390a, S35390A_CMD_STATUS2, &buf, 1); err = s35390a_set_reg(s35390a, S35390A_CMD_STATUS2, &buf, 1);
if (err < 0) { if (err < 0) {
dev_err(&client->dev, "error disabling alarm"); dev_err(dev, "error disabling alarm");
goto exit_dummy; goto exit_dummy;
} }
} else { } else {
err = s35390a_disable_test_mode(s35390a); err = s35390a_disable_test_mode(s35390a);
if (err < 0) { if (err < 0) {
dev_err(&client->dev, "error disabling test mode\n"); dev_err(dev, "error disabling test mode\n");
goto exit_dummy; goto exit_dummy;
} }
} }
device_set_wakeup_capable(&client->dev, 1); device_set_wakeup_capable(dev, 1);
s35390a->rtc = devm_rtc_device_register(&client->dev, s35390a->rtc = devm_rtc_device_register(dev, s35390a_driver.driver.name,
s35390a_driver.driver.name, &s35390a_rtc_ops, THIS_MODULE);
&s35390a_rtc_ops, THIS_MODULE);
if (IS_ERR(s35390a->rtc)) { if (IS_ERR(s35390a->rtc)) {
err = PTR_ERR(s35390a->rtc); err = PTR_ERR(s35390a->rtc);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment