mechanical edits before code changes, to reduce diffs later on
- rename the 'work' member of the driver's private data to better
reflect that it's the work routine which scans the matrix after a
change of status was detected
- rename the __activate_col() routine to better reflect that it takes
care of GPIO pins while its caller handles logical matrix lines
Signed-off-by: Gerhard Sittig <g...@denx.de>
---
drivers/input/keyboard/matrix_keypad.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/input/keyboard/matrix_keypad.c
b/drivers/input/keyboard/matrix_keypad.c
index 71d7719..5b5f86d 100644
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -35,7 +35,7 @@ struct matrix_keypad {
DECLARE_BITMAP(disabled_gpios, MATRIX_MAX_ROWS);
uint32_t last_key_state[MATRIX_MAX_COLS];
- struct delayed_work work;
+ struct delayed_work work_scan_matrix;
spinlock_t lock;
bool scan_pending;
bool stopped;
@@ -47,8 +47,8 @@ struct matrix_keypad {
* minmal side effect when scanning other columns, here it is configured to
* be input, and it should work on most platforms.
*/
-static void __activate_col(const struct matrix_keypad_platform_data *pdata,
- int col, bool on)
+static void __activate_col_pin(const struct matrix_keypad_platform_data *pdata,
+ int col, bool on)
{
bool level_on = !pdata->active_low;
@@ -63,7 +63,7 @@ static void __activate_col(const struct
matrix_keypad_platform_data *pdata,
static void activate_col(const struct matrix_keypad_platform_data *pdata,
int col, bool on)
{
- __activate_col(pdata, col, on);
+ __activate_col_pin(pdata, col, on);
if (on && pdata->col_scan_delay_us)
udelay(pdata->col_scan_delay_us);
@@ -75,7 +75,7 @@ static void activate_all_cols(const struct
matrix_keypad_platform_data *pdata,
int col;
for (col = 0; col < pdata->num_col_gpios; col++)
- __activate_col(pdata, col, on);
+ __activate_col_pin(pdata, col, on);
}
static bool row_asserted(const struct matrix_keypad_platform_data *pdata,
@@ -116,8 +116,8 @@ static void disable_row_irqs(struct matrix_keypad *keypad)
*/
static void matrix_keypad_scan(struct work_struct *work)
{
- struct matrix_keypad *keypad =
- container_of(work, struct matrix_keypad, work.work);
+ struct matrix_keypad *keypad = container_of(work, struct matrix_keypad,
+ work_scan_matrix.work);
struct input_dev *input_dev = keypad->input_dev;
const unsigned short *keycodes = input_dev->keycode;
const struct matrix_keypad_platform_data *pdata = keypad->pdata;
@@ -189,8 +189,8 @@ static irqreturn_t matrix_keypad_interrupt(int irq, void
*id)
disable_row_irqs(keypad);
keypad->scan_pending = true;
- schedule_delayed_work(&keypad->work,
- msecs_to_jiffies(keypad->pdata->debounce_ms));
+ schedule_delayed_work(&keypad->work_scan_matrix,
+ msecs_to_jiffies(keypad->pdata->debounce_ms));
out:
spin_unlock_irqrestore(&keypad->lock, flags);
@@ -208,7 +208,7 @@ static int matrix_keypad_start(struct input_dev *dev)
* Schedule an immediate key scan to capture current key state;
* columns will be activated and IRQs be enabled after the scan.
*/
- schedule_delayed_work(&keypad->work, 0);
+ schedule_delayed_work(&keypad->work_scan_matrix, 0);
return 0;
}
@@ -219,7 +219,7 @@ static void matrix_keypad_stop(struct input_dev *dev)
keypad->stopped = true;
mb();
- flush_work(&keypad->work.work);
+ flush_work(&keypad->work_scan_matrix.work);
/*
* matrix_keypad_scan() will leave IRQs enabled;
* we should disable them now.
@@ -495,7 +495,7 @@ static int matrix_keypad_probe(struct platform_device *pdev)
keypad->pdata = pdata;
keypad->row_shift = get_count_order(pdata->num_col_gpios);
keypad->stopped = true;
- INIT_DELAYED_WORK(&keypad->work, matrix_keypad_scan);
+ INIT_DELAYED_WORK(&keypad->work_scan_matrix, matrix_keypad_scan);
spin_lock_init(&keypad->lock);
input_dev->name = pdev->name;
--
1.7.10.4
_______________________________________________
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss
