Commit 6ef0c333 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Greg Kroah-Hartman

auxdisplay: ht16k33: use le16_to_cpup() to fetch LE16 data

The data read from the device is 3 little-endian words, so let's
annotate them as such and use le16_to_cpu() to convert them to host
endianness - it might turn out to be a bit more performant, and it
expresses the conversion more clearly.
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 750100a4
...@@ -254,18 +254,22 @@ static bool ht16k33_keypad_scan(struct ht16k33_keypad *keypad) ...@@ -254,18 +254,22 @@ static bool ht16k33_keypad_scan(struct ht16k33_keypad *keypad)
{ {
const unsigned short *keycodes = keypad->dev->keycode; const unsigned short *keycodes = keypad->dev->keycode;
u16 new_state[HT16K33_MATRIX_KEYPAD_MAX_COLS]; u16 new_state[HT16K33_MATRIX_KEYPAD_MAX_COLS];
u8 data[HT16K33_MATRIX_KEYPAD_MAX_COLS * 2]; __le16 data[HT16K33_MATRIX_KEYPAD_MAX_COLS];
unsigned long bits_changed; unsigned long bits_changed;
int row, col, code; int row, col, code;
int rc;
bool pressed = false; bool pressed = false;
if (i2c_smbus_read_i2c_block_data(keypad->client, 0x40, 6, data) != 6) { rc = i2c_smbus_read_i2c_block_data(keypad->client, 0x40,
dev_err(&keypad->client->dev, "Failed to read key data\n"); sizeof(data), (u8 *)data);
if (rc != sizeof(data)) {
dev_err(&keypad->client->dev,
"Failed to read key data, rc=%d\n", rc);
return false; return false;
} }
for (col = 0; col < keypad->cols; col++) { for (col = 0; col < keypad->cols; col++) {
new_state[col] = (data[col * 2 + 1] << 8) | data[col * 2]; new_state[col] = le16_to_cpu(data[col]);
if (new_state[col]) if (new_state[col])
pressed = true; pressed = true;
bits_changed = keypad->last_key_state[col] ^ new_state[col]; bits_changed = keypad->last_key_state[col] ^ new_state[col];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment