diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index 684454d2f41d..9e8b7082aa00 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -896,6 +896,7 @@ config I2C_MSM_GENI
 	tristate "Qualcomm Technologies Inc.'s GENI based I2C controller"
 	depends on ARCH_QCOM || COMPILE_TEST
 	depends on MSM_GENI_SE
+	default n
 	help
 	  This driver supports GENI serial engine based I2C controller in
 	  master mode on the Qualcomm Technologies Inc.'s SoCs. If you say
diff --git a/drivers/i2c/busses/i2c-msm-geni.c b/drivers/i2c/busses/i2c-msm-geni.c
index 4baca39369ef..cc3b127f93c6 100644
--- a/drivers/i2c/busses/i2c-msm-geni.c
+++ b/drivers/i2c/busses/i2c-msm-geni.c
@@ -977,7 +977,7 @@ static int geni_i2c_resume_noirq(struct device *device)
 	return 0;
 }
 
-#ifdef CONFIG_PM
+#if IS_ENABLED(CONFIG_PM)
 static int geni_i2c_runtime_suspend(struct device *dev)
 {
 	struct geni_i2c_dev *gi2c = dev_get_drvdata(dev);
@@ -1108,7 +1108,17 @@ static struct platform_driver geni_i2c_driver = {
 	},
 };
 
-module_platform_driver(geni_i2c_driver);
+static int __init i2c_dev_init(void)
+{
+	return platform_driver_register(&geni_i2c_driver);
+}
 
+static void __exit i2c_dev_exit(void)
+{
+	platform_driver_unregister(&geni_i2c_driver);
+}
+
+module_init(i2c_dev_init);
+module_exit(i2c_dev_exit);
 MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:i2c_geni");