Merge "leds: leds-qpnp: correct various coding style issues"

3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/platform/msm/Kconfig b/drivers/platform/msm/Kconfig
index 9c2697dde76d..024c66ac8e57 100644
--- a/drivers/platform/msm/Kconfig
+++ b/drivers/platform/msm/Kconfig
@@ -5,20 +5,20 @@ config QPNP_REVID
 	tristate "QPNP Revision ID Peripheral"
 	depends on SPMI
 	help
-	  Say 'y' here to include support for the Qualcomm QPNP REVID
-	  peripheral. REVID prints out the PMIC type and revision numbers
-	  in the kernel log along with the PMIC option status. The PMIC
-	  type is mapped to a Qualcomm chip part number and logged as well.
+	  Say 'y' here to include support for the Qualcomm Technologies, Inc.
+	  QPNP REVID peripheral. REVID prints out the PMIC type and revision
+	  numbers in the kernel log along with the PMIC option status. The PMIC
+	  type is mapped to a QTI chip part number and logged as well.
 
 config QPNP_COINCELL
-	tristate "Qualcomm QPNP coincell charger support"
+	tristate "QPNP coincell charger support"
 	depends on SPMI
 	help
 	  This driver supports the QPNP coincell peripheral found inside of
-	  Qualcomm QPNP PMIC devices.  The coincell charger provides a means to
-	  charge a coincell battery or backup capacitor which is used to
-	  maintain PMIC register state when the main battery is removed from the
-	  mobile device.
+	  Qualcomm Technologies, Inc. QPNP PMIC devices.  The coincell charger
+	  provides a means to charge a coincell battery or backup capacitor
+	  which is used to maintain PMIC register state when the main battery is
+	  removed from the mobile device.
 
 config SPS
 	bool "SPS support"
diff --git a/drivers/platform/msm/qpnp-coincell.c b/drivers/platform/msm/qpnp-coincell.c
index 6aaa53526868..b427f43e76df 100644
--- a/drivers/platform/msm/qpnp-coincell.c
+++ b/drivers/platform/msm/qpnp-coincell.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2015, 2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -244,7 +244,7 @@ static int qpnp_coincell_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static struct of_device_id qpnp_coincell_match_table[] = {
+static const struct of_device_id qpnp_coincell_match_table[] = {
 	{ .compatible = QPNP_COINCELL_DRIVER_NAME, },
 	{}
 };
diff --git a/drivers/platform/msm/qpnp-revid.c b/drivers/platform/msm/qpnp-revid.c
index 6b5db58f856a..9ea0b40304eb 100644
--- a/drivers/platform/msm/qpnp-revid.c
+++ b/drivers/platform/msm/qpnp-revid.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2017, The Linux Foundation. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 and
@@ -70,7 +70,7 @@ struct revid_chip {
 static LIST_HEAD(revid_chips);
 static DEFINE_MUTEX(revid_chips_lock);
 
-static struct of_device_id qpnp_revid_match_table[] = {
+static const struct of_device_id qpnp_revid_match_table[] = {
 	{ .compatible = QPNP_REVID_DEV_NAME },
 	{}
 };