Merge branch 'perm-fix' into omap-for-v4.19/fixes-v2

1 files changed, 32 insertions, 0 deletions

diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index e5fd2707b6df..9493d4a388db 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -93,6 +93,7 @@ enum hwmon_temp_attributes {
 #define HWMON_T_MIN_ALARM       BIT(hwmon_temp_min_alarm)
 #define HWMON_T_MAX_ALARM       BIT(hwmon_temp_max_alarm)
 #define HWMON_T_CRIT_ALARM      BIT(hwmon_temp_crit_alarm)
+#define HWMON_T_LCRIT_ALARM     BIT(hwmon_temp_lcrit_alarm)
 #define HWMON_T_EMERGENCY_ALARM BIT(hwmon_temp_emergency_alarm)
 #define HWMON_T_FAULT           BIT(hwmon_temp_fault)
 #define HWMON_T_OFFSET          BIT(hwmon_temp_offset)
@@ -187,12 +188,16 @@ enum hwmon_power_attributes {
         hwmon_power_cap_hyst,
         hwmon_power_cap_max,
         hwmon_power_cap_min,
+        hwmon_power_min,
         hwmon_power_max,
         hwmon_power_crit,
+        hwmon_power_lcrit,
         hwmon_power_label,
         hwmon_power_alarm,
         hwmon_power_cap_alarm,
+        hwmon_power_min_alarm,
         hwmon_power_max_alarm,
+        hwmon_power_lcrit_alarm,
         hwmon_power_crit_alarm,
 };
 
@@ -213,12 +218,16 @@ enum hwmon_power_attributes {
 #define HWMON_P_CAP_HYST                BIT(hwmon_power_cap_hyst)
 #define HWMON_P_CAP_MAX                 BIT(hwmon_power_cap_max)
 #define HWMON_P_CAP_MIN                 BIT(hwmon_power_cap_min)
+#define HWMON_P_MIN                     BIT(hwmon_power_min)
 #define HWMON_P_MAX                     BIT(hwmon_power_max)
+#define HWMON_P_LCRIT                   BIT(hwmon_power_lcrit)
 #define HWMON_P_CRIT                    BIT(hwmon_power_crit)
 #define HWMON_P_LABEL                   BIT(hwmon_power_label)
 #define HWMON_P_ALARM                   BIT(hwmon_power_alarm)
 #define HWMON_P_CAP_ALARM               BIT(hwmon_power_cap_alarm)
+#define HWMON_P_MIN_ALARM               BIT(hwmon_power_max_alarm)
 #define HWMON_P_MAX_ALARM               BIT(hwmon_power_max_alarm)
+#define HWMON_P_LCRIT_ALARM             BIT(hwmon_power_lcrit_alarm)
 #define HWMON_P_CRIT_ALARM              BIT(hwmon_power_crit_alarm)
 
 enum hwmon_energy_attributes {
@@ -389,4 +398,27 @@ devm_hwmon_device_register_with_info(struct device *dev,
 void hwmon_device_unregister(struct device *dev);
 void devm_hwmon_device_unregister(struct device *dev);
 
+/**
+ * hwmon_is_bad_char - Is the char invalid in a hwmon name
+ * @ch: the char to be considered
+ *
+ * hwmon_is_bad_char() can be used to determine if the given character
+ * may not be used in a hwmon name.
+ *
+ * Returns true if the char is invalid, false otherwise.
+ */
+static inline bool hwmon_is_bad_char(const char ch)
+{
+        switch (ch) {
+        case '-':
+        case '*':
+        case ' ':
+        case '\t':
+        case '\n':
+                return true;
+        default:
+                return false;
+        }
+}
+
 #endif