media: dvbringbuffer : fix space issues
PATCH v2 1/1 media: dvbringbuffer : fix space issues
Fix the space issues detected by the checkpatch tool
Changes in v2:
- Split multiple assignments into separate lines
Signed-off-by Nikhil S <[email protected]>
--- drivers/media/dvb-core/dvb_ringbuffer.c | 34 +++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-)
drivers/media/dvb-core/dvb_ringbuffer.c +20 -14
@@ -37,10 +37,11 @@void dvb_ringbuffer_init (struct dvb_ringbuffer *rbuf,void *data,size_t len) { - rbuf->pread=rbuf->pwrite=0 ; - rbuf->data=data; - rbuf->size=len; - rbuf->error=0 ; + rbuf->pread =0 ; + rbuf->pwrite =0 ; + rbuf->data = data; + rbuf->size = len; + rbuf->error =0 ;init_waitqueue_head (&rbuf->queue);
@@ -235,7 +236,7 @@ ssize_t dvb_ringbuffer_write_user(struct dvb_ringbuffer *rbuf,return len; } -ssize_t dvb_ringbuffer_pkt_write (struct dvb_ringbuffer *rbuf,u8 * buf,size_t len) +ssize_t dvb_ringbuffer_pkt_write (struct dvb_ringbuffer *rbuf,u8 *buf,size_t len) {int status;ssize_t oldpwrite = rbuf->pwrite;
@@ -245,7 +246,8 @@ ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t leDVB_RINGBUFFER_WRITE_BYTE (rbuf,PKT_READY ); status =dvb_ringbuffer_write (rbuf, buf, len); -if (status <0 ) rbuf->pwrite = oldpwrite; +if (status <0 ) + rbuf->pwrite = oldpwrite;return status; }
@@ -258,8 +260,10 @@ ssize_t dvb_ringbuffer_pkt_read_user(struct dvb_ringbuffer *rbuf, size_t idx, pktlen = rbuf->data[idx] <<8 ; pktlen |= rbuf->data[(idx +1 ) % rbuf->size]; -if (offset > pktlen)return -EINVAL ; -if ((offset + len) > pktlen) len = pktlen - offset; +if (offset > pktlen) +return -EINVAL ; +if ((offset + len) > pktlen) + len = pktlen - offset; idx = (idx +DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; todo = len;
@@ -278,7 +282,7 @@ ssize_t dvb_ringbuffer_pkt_read_user(struct dvb_ringbuffer *rbuf, size_t idx, }ssize_t dvb_ringbuffer_pkt_read (struct dvb_ringbuffer *rbuf,size_t idx, -int offset,u8 * buf,size_t len) +int offset,u8 *buf,size_t len) {size_t todo;size_t split;
@@ -286,8 +290,10 @@ ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, pktlen = rbuf->data[idx] <<8 ; pktlen |= rbuf->data[(idx +1 ) % rbuf->size]; -if (offset > pktlen)return -EINVAL ; -if ((offset + len) > pktlen) len = pktlen - offset; +if (offset > pktlen) +return -EINVAL ; +if ((offset + len) > pktlen) + len = pktlen - offset; idx = (idx +DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; todo = len;
@@ -309,7 +315,7 @@ void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) rbuf->data[(idx +2 ) % rbuf->size] =PKT_DISPOSED ;// clean up disposed packets -while (dvb_ringbuffer_avail (rbuf) >DVB_RINGBUFFER_PKTHDRSIZE ) { +while (dvb_ringbuffer_avail (rbuf) >DVB_RINGBUFFER_PKTHDRSIZE ) {if (DVB_RINGBUFFER_PEEK (rbuf,2 ) ==PKT_DISPOSED ) { pktlen =DVB_RINGBUFFER_PEEK (rbuf,0 ) <<8 ; pktlen |=DVB_RINGBUFFER_PEEK (rbuf,1 );
@@ -321,7 +327,7 @@ void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) } } -ssize_t dvb_ringbuffer_pkt_next (struct dvb_ringbuffer *rbuf,size_t idx,size_t * pktlen) +ssize_t dvb_ringbuffer_pkt_next (struct dvb_ringbuffer *rbuf,size_t idx,size_t *pktlen) {int consumed;int curpktlen;
@@ -339,7 +345,7 @@ ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t*if (consumed <0 ) consumed += rbuf->size; -while ((dvb_ringbuffer_avail (rbuf) - consumed) >DVB_RINGBUFFER_PKTHDRSIZE ) { +while ((dvb_ringbuffer_avail (rbuf) - consumed) >DVB_RINGBUFFER_PKTHDRSIZE ) { curpktlen = rbuf->data[idx] <<8 ; curpktlen |= rbuf->data[(idx +1 ) % rbuf->size];
Signature · 1 line
2.43.0
Quoted 4 lines · Nikhil S
Fix the space issues detected by the checkpatch tool
Changes in v2:
- Split multiple assignments into separate lines
This patch is a duplicate of:
https://lore.kernel.org/linux-media/[email protected]/
which has already been merged. So I'm dropping this one.
Regards,
Hans
Quoted 107 lines
Signed-off-by Nikhil S <[email protected]>--- drivers/media/dvb-core/dvb_ringbuffer.c | 34 +++++++++++++++---------- 1 file changed, 20 insertions(+), 14 deletions(-)drivers/media/dvb-core/dvb_ringbuffer.c +20
-14@@ -37,10 +37,11 @@void dvb_ringbuffer_init (struct dvb_ringbuffer *rbuf,void *data,size_t len) { - rbuf->pread=rbuf->pwrite=0 ; - rbuf->data=data; - rbuf->size=len; - rbuf->error=0 ; + rbuf->pread =0 ; + rbuf->pwrite =0 ; + rbuf->data = data; + rbuf->size = len; + rbuf->error =0 ;init_waitqueue_head (&rbuf->queue);@@ -235,7 +236,7 @@ ssize_t dvb_ringbuffer_write_user(struct dvb_ringbuffer *rbuf,return len; } -ssize_t dvb_ringbuffer_pkt_write (struct dvb_ringbuffer *rbuf,u8 * buf,size_t len) +ssize_t dvb_ringbuffer_pkt_write (struct dvb_ringbuffer *rbuf,u8 *buf,size_t len) {int status;ssize_t oldpwrite = rbuf->pwrite;@@ -245,7 +246,8 @@ ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t leDVB_RINGBUFFER_WRITE_BYTE (rbuf,PKT_READY ); status =dvb_ringbuffer_write (rbuf, buf, len); -if (status <0 ) rbuf->pwrite = oldpwrite; +if (status <0 ) + rbuf->pwrite = oldpwrite;return status; }@@ -258,8 +260,10 @@ ssize_t dvb_ringbuffer_pkt_read_user(struct dvb_ringbuffer *rbuf, size_t idx, pktlen = rbuf->data[idx] <<8 ; pktlen |= rbuf->data[(idx +1 ) % rbuf->size]; -if (offset > pktlen)return -EINVAL ; -if ((offset + len) > pktlen) len = pktlen - offset; +if (offset > pktlen) +return -EINVAL ; +if ((offset + len) > pktlen) + len = pktlen - offset; idx = (idx +DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; todo = len;@@ -278,7 +282,7 @@ ssize_t dvb_ringbuffer_pkt_read_user(struct dvb_ringbuffer *rbuf, size_t idx, }ssize_t dvb_ringbuffer_pkt_read (struct dvb_ringbuffer *rbuf,size_t idx, -int offset,u8 * buf,size_t len) +int offset,u8 *buf,size_t len) {size_t todo;size_t split;@@ -286,8 +290,10 @@ ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, pktlen = rbuf->data[idx] <<8 ; pktlen |= rbuf->data[(idx +1 ) % rbuf->size]; -if (offset > pktlen)return -EINVAL ; -if ((offset + len) > pktlen) len = pktlen - offset; +if (offset > pktlen) +return -EINVAL ; +if ((offset + len) > pktlen) + len = pktlen - offset; idx = (idx +DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; todo = len;@@ -309,7 +315,7 @@ void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) rbuf->data[(idx +2 ) % rbuf->size] =PKT_DISPOSED ;// clean up disposed packets -while (dvb_ringbuffer_avail (rbuf) >DVB_RINGBUFFER_PKTHDRSIZE ) { +while (dvb_ringbuffer_avail (rbuf) >DVB_RINGBUFFER_PKTHDRSIZE ) {if (DVB_RINGBUFFER_PEEK (rbuf,2 ) ==PKT_DISPOSED ) { pktlen =DVB_RINGBUFFER_PEEK (rbuf,0 ) <<8 ; pktlen |=DVB_RINGBUFFER_PEEK (rbuf,1 );@@ -321,7 +327,7 @@ void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) } } -ssize_t dvb_ringbuffer_pkt_next (struct dvb_ringbuffer *rbuf,size_t idx,size_t * pktlen) +ssize_t dvb_ringbuffer_pkt_next (struct dvb_ringbuffer *rbuf,size_t idx,size_t *pktlen) {int consumed;int curpktlen;@@ -339,7 +345,7 @@ ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t*if (consumed <0 ) consumed += rbuf->size; -while ((dvb_ringbuffer_avail (rbuf) - consumed) >DVB_RINGBUFFER_PKTHDRSIZE ) { +while ((dvb_ringbuffer_avail (rbuf) - consumed) >DVB_RINGBUFFER_PKTHDRSIZE ) { curpktlen = rbuf->data[idx] <<8 ; curpktlen |= rbuf->data[(idx +1 ) % rbuf->size];