Commit fd8392f3 authored by Gulsah Kose's avatar Gulsah Kose Committed by Greg Kroah-Hartman

staging: media: lirc: Fix missing blank line warning.

Fixes "Missing a blank line after declarations" checkpatch.pl warning in
lirc_zilog.c
Signed-off-by: default avatarGulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3170f327
...@@ -618,6 +618,7 @@ static int get_key_data(unsigned char *buf, ...@@ -618,6 +618,7 @@ static int get_key_data(unsigned char *buf,
for (base = 0, lim = keys - 1; lim; lim >>= 1) { for (base = 0, lim = keys - 1; lim; lim >>= 1) {
/* Seek to block */ /* Seek to block */
unsigned char *key_data; unsigned char *key_data;
pos = base + (lim >> 1); pos = base + (lim >> 1);
key_data = key_block + (ndiffs + 1) * pos; key_data = key_block + (ndiffs + 1) * pos;
...@@ -628,6 +629,7 @@ static int get_key_data(unsigned char *buf, ...@@ -628,6 +629,7 @@ static int get_key_data(unsigned char *buf,
/* found, so unpack the diffs */ /* found, so unpack the diffs */
for (i = 0; i < ndiffs; ++i) { for (i = 0; i < ndiffs; ++i) {
unsigned char val; unsigned char val;
if (!read_uint8(&key_data, endp, &val) || if (!read_uint8(&key_data, endp, &val) ||
diffs[i] >= TX_BLOCK_SIZE) diffs[i] >= TX_BLOCK_SIZE)
goto corrupt; goto corrupt;
...@@ -656,6 +658,7 @@ static int send_data_block(struct IR_tx *tx, unsigned char *data_block) ...@@ -656,6 +658,7 @@ static int send_data_block(struct IR_tx *tx, unsigned char *data_block)
for (i = 0; i < TX_BLOCK_SIZE;) { for (i = 0; i < TX_BLOCK_SIZE;) {
int tosend = TX_BLOCK_SIZE - i; int tosend = TX_BLOCK_SIZE - i;
if (tosend > 4) if (tosend > 4)
tosend = 4; tosend = 4;
buf[0] = (unsigned char)(i + 1); buf[0] = (unsigned char)(i + 1);
...@@ -838,6 +841,7 @@ static int fw_load(struct IR_tx *tx) ...@@ -838,6 +841,7 @@ static int fw_load(struct IR_tx *tx)
goto corrupt; goto corrupt;
for (i = 0; i < num_global_fixed; ++i) { for (i = 0; i < num_global_fixed; ++i) {
unsigned char pos, val; unsigned char pos, val;
if (!read_uint8(&data, tx_data->endp, &pos) || if (!read_uint8(&data, tx_data->endp, &pos) ||
!read_uint8(&data, tx_data->endp, &val) || !read_uint8(&data, tx_data->endp, &val) ||
pos >= TX_BLOCK_SIZE) pos >= TX_BLOCK_SIZE)
...@@ -1336,6 +1340,7 @@ static int close(struct inode *node, struct file *filep) ...@@ -1336,6 +1340,7 @@ static int close(struct inode *node, struct file *filep)
{ {
/* find our IR struct */ /* find our IR struct */
struct IR *ir = filep->private_data; struct IR *ir = filep->private_data;
if (ir == NULL) { if (ir == NULL) {
zilog_error("close: no private_data attached to the file!\n"); zilog_error("close: no private_data attached to the file!\n");
return -ENODEV; return -ENODEV;
...@@ -1402,6 +1407,7 @@ static int ir_remove(struct i2c_client *client) ...@@ -1402,6 +1407,7 @@ static int ir_remove(struct i2c_client *client)
{ {
if (strncmp("ir_tx_z8", client->name, 8) == 0) { if (strncmp("ir_tx_z8", client->name, 8) == 0) {
struct IR_tx *tx = i2c_get_clientdata(client); struct IR_tx *tx = i2c_get_clientdata(client);
if (tx != NULL) { if (tx != NULL) {
mutex_lock(&tx->client_lock); mutex_lock(&tx->client_lock);
tx->c = NULL; tx->c = NULL;
...@@ -1410,6 +1416,7 @@ static int ir_remove(struct i2c_client *client) ...@@ -1410,6 +1416,7 @@ static int ir_remove(struct i2c_client *client)
} }
} else if (strncmp("ir_rx_z8", client->name, 8) == 0) { } else if (strncmp("ir_rx_z8", client->name, 8) == 0) {
struct IR_rx *rx = i2c_get_clientdata(client); struct IR_rx *rx = i2c_get_clientdata(client);
if (rx != NULL) { if (rx != NULL) {
mutex_lock(&rx->client_lock); mutex_lock(&rx->client_lock);
rx->c = NULL; rx->c = NULL;
......
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