diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index e0a340f..293d2c1 100644
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -236,8 +236,6 @@ static int isl12022_probe(struct i2c_client *client,
 
 	int ret = 0;
 
-	dev_dbg(&client->dev, "%s\n", __func__);
-
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_I2C))
 		return -ENODEV;
 
@@ -245,7 +243,7 @@ static int isl12022_probe(struct i2c_client *client,
 	if (!isl12022)
 		return -ENOMEM;
 
-	dev_info(&client->dev, "chip found, driver version " DRV_VERSION "\n");
+	dev_dbg(&client->dev, "chip found, driver version " DRV_VERSION "\n");
 
 	i2c_set_clientdata(client, isl12022);
 
@@ -269,9 +267,7 @@ static int isl12022_remove(struct i2c_client *client)
 {
 	struct isl12022 *isl12022 = i2c_get_clientdata(client);
 
-	if (isl12022->rtc)
-		rtc_device_unregister(isl12022->rtc);
-
+	rtc_device_unregister(isl12022->rtc);
 	kfree(isl12022);
 
 	return 0;
@@ -303,10 +299,10 @@ static void __exit isl12022_exit(void)
 	i2c_del_driver(&isl12022_driver);
 }
 
+module_init(isl12022_init);
+module_exit(isl12022_exit);
+
 MODULE_AUTHOR("roman.fietze@telemotive.de");
 MODULE_DESCRIPTION("ISL 12022 RTC driver");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(DRV_VERSION);
-
-module_init(isl12022_init);
-module_exit(isl12022_exit);