]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
pinctrl: intel: Use NSEC_PER_USEC for debounce calculus
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 7 Aug 2019 13:41:50 +0000 (16:41 +0300)
committerAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Wed, 7 Aug 2019 14:25:19 +0000 (17:25 +0300)
Replace hard coded constants with self-explanatory names, i.e.
use NSEC_PER_USEC for debounce calculus.

While here, add a unit suffix to debounce period constant.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
drivers/pinctrl/intel/pinctrl-intel.c

index 5c7348caac36d36726c80ba468226391a557376c..28eaa1e5dc1f79e90f3202f240a36df0aa4a6d90 100644 (file)
@@ -8,12 +8,13 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/gpio/driver.h>
 #include <linux/log2.h>
+#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/property.h>
+#include <linux/time.h>
 
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
@@ -70,7 +71,7 @@
 #define PADCFG2_DEBOUNCE_SHIFT         1
 #define PADCFG2_DEBOUNCE_MASK          GENMASK(4, 1)
 
-#define DEBOUNCE_PERIOD                        31250 /* ns */
+#define DEBOUNCE_PERIOD_NSEC           31250
 
 struct intel_pad_context {
        u32 padcfg0;
@@ -565,7 +566,7 @@ static int intel_config_get(struct pinctrl_dev *pctldev, unsigned int pin,
                        return -EINVAL;
 
                v = (v & PADCFG2_DEBOUNCE_MASK) >> PADCFG2_DEBOUNCE_SHIFT;
-               arg = BIT(v) * DEBOUNCE_PERIOD / 1000;
+               arg = BIT(v) * DEBOUNCE_PERIOD_NSEC / NSEC_PER_USEC;
 
                break;
        }
@@ -682,7 +683,7 @@ static int intel_config_set_debounce(struct intel_pinctrl *pctrl,
        if (debounce) {
                unsigned long v;
 
-               v = order_base_2(debounce * 1000 / DEBOUNCE_PERIOD);
+               v = order_base_2(debounce * NSEC_PER_USEC / DEBOUNCE_PERIOD_NSEC);
                if (v < 3 || v > 15) {
                        ret = -EINVAL;
                        goto exit_unlock;