2014-07-01 07:12:40

by Raphael Poggi

Subject: [PATCH 1/2 RESEND] staging: lirc: fix checkpath errors: blank lines

This patch fix checkpath "WARNING: Missing a blank line after declarations"

Signed-off-by: Raphaël Poggi <[email protected]>
---
drivers/staging/media/lirc/lirc_imon.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index a5b62ee..f8c3375 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -189,6 +189,7 @@ MODULE_PARM_DESC(debug, "Debug messages: 0=no, 1=yes(default: no)");
static void free_imon_context(struct imon_context *context)
{
struct device *dev = context->driver->dev;
+
usb_free_urb(context->tx_urb);
usb_free_urb(context->rx_urb);
lirc_buffer_free(context->driver->rbuf);
@@ -656,6 +657,7 @@ static void imon_incoming_packet(struct imon_context *context,
mask = 0x80;
for (bit = 0; bit < 8; ++bit) {
int curr_bit = !(buf[octet] & mask);
+
if (curr_bit != context->rx.prev_bit) {
if (context->rx.count) {
submit_data(context);
@@ -775,6 +777,7 @@ static int imon_probe(struct usb_interface *interface,
struct usb_endpoint_descriptor *ep;
int ep_dir;
int ep_type;
+
ep = &iface_desc->endpoint[i].desc;
ep_dir = ep->bEndpointAddress & USB_ENDPOINT_DIR_MASK;
ep_type = ep->bmAttributes & USB_ENDPOINT_XFERTYPE_MASK;
--
1.7.9.5

2014-07-01 07:12:44

by Raphael Poggi

Subject: [PATCH 2/2 RESEND] staging: lirc: remove return void function

This patch fix checkpath "WARNING: void function return statements are not generally useful".
The removed return were useless in that case.

Signed-off-by: Raphaël Poggi <[email protected]>
---
drivers/staging/media/lirc/lirc_imon.c | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/staging/media/lirc/lirc_imon.c b/drivers/staging/media/lirc/lirc_imon.c
index f8c3375..96c76b3 100644
--- a/drivers/staging/media/lirc/lirc_imon.c
+++ b/drivers/staging/media/lirc/lirc_imon.c
@@ -482,8 +482,6 @@ static void usb_tx_callback(struct urb *urb)
/* notify waiters that write has finished */
atomic_set(&context->tx.busy, 0);
complete(&context->tx.finished);
-
- return;
}

/**
@@ -548,7 +546,6 @@ static void ir_close(void *data)
}

mutex_unlock(&context->ctx_lock);
- return;
}

/**
@@ -573,7 +570,6 @@ static void submit_data(struct imon_context *context)

lirc_buffer_write(context->driver->rbuf, buf);
wake_up(&context->driver->rbuf->wait_poll);
- return;
}

static inline int tv2int(const struct timeval *a, const struct timeval *b)
@@ -709,8 +705,6 @@ static void usb_rx_callback(struct urb *urb)
}

usb_submit_urb(context->rx_urb, GFP_ATOMIC);
-
- return;
}

/**
--
1.7.9.5