Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7133eca1 authored by Alexandre Belloni's avatar Alexandre Belloni
Browse files

rtc: rv8803: switch to rtc_register_device 



This removes a possible race condition and allows for further improvement
of the driver.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
parent 697e5a47

drivers/rtc/rtc-rv8803.c

+9 −6
Original line number Diff line number Diff line
@@ -577,6 +577,11 @@ static int rv8803_probe(struct i2c_client *client, 
	if (flags & RV8803_FLAG_AF)

		dev_warn(&client->dev, "An alarm maybe have been missed.\n");



	rv8803->rtc = devm_rtc_allocate_device(&client->dev);

	if (IS_ERR(rv8803->rtc)) {

		return PTR_ERR(rv8803->rtc);

	}



	if (client->irq > 0) {

		err = devm_request_threaded_irq(&client->dev, client->irq,

						NULL, rv8803_handle_irq,
@@ -592,12 +597,10 @@ static int rv8803_probe(struct i2c_client *client, 
		}

	}



	rv8803->rtc = devm_rtc_device_register(&client->dev, client->name,

					       &rv8803_rtc_ops, THIS_MODULE);

	if (IS_ERR(rv8803->rtc)) {

		dev_err(&client->dev, "unable to register the class device\n");

		return PTR_ERR(rv8803->rtc);

	}

	rv8803->rtc->ops = &rv8803_rtc_ops;

	err = rtc_register_device(rv8803->rtc);

	if (err)

		return err;



	err = rv8803_write_reg(rv8803->client, RV8803_EXT, RV8803_EXT_WADA);

	if (err)