From: Andreas Siegling <andreas.siegling@fau.de>
To: devel@linuxdriverproject.org
Cc: linux-kernel@i4.cs.fau.de, hsweeten@visionengravers.com,
abbotti@mev.co.uk, gregkh@linuxfoundation.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
ebru.akagunduz@gmail.com, chase.southwood@gmail.com,
rickard_strandqvist@spectrumdigital.se,
Andreas Siegling <andreas.siegling@fau.de>,
Zhutao Lu <lvzhutao@gmail.com>
Subject: [PATCH 3/3] comedi: checkpatch warning: missing blank line
Date: Sun, 28 Dec 2014 19:56:15 +0100 [thread overview]
Message-ID: <1419792975-31519-4-git-send-email-andreas.siegling@fau.de> (raw)
In-Reply-To: <1419792975-31519-1-git-send-email-andreas.siegling@fau.de>
This patch will fix all occurrences of the checkpatch warning:
WARNING: Missing a blank line after declarations
in drivers/staging/comedi/.
Signed-off-by: Andreas Siegling <andreas.siegling@fau.de>
Signed-off-by: Zhutao Lu <lvzhutao@gmail.com>
---
drivers/staging/comedi/drivers/comedi_bond.c | 1 +
drivers/staging/comedi/drivers/ni_stc.h | 4 ++++
2 files changed, 5 insertions(+)
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c
index 85b2f4a..221d381 100644
--- a/drivers/staging/comedi/drivers/comedi_bond.c
+++ b/drivers/staging/comedi/drivers/comedi_bond.c
@@ -261,6 +261,7 @@ static int do_dev_config(struct comedi_device *dev, struct comedi_devconfig *it)
{
/* Append dev:subdev to devpriv->name */
char buf[20];
+
snprintf(buf, sizeof(buf), "%u:%u ",
bdev->minor, bdev->subdev);
strlcat(devpriv->name, buf,
diff --git a/drivers/staging/comedi/drivers/ni_stc.h b/drivers/staging/comedi/drivers/ni_stc.h
index bb76fe1..3b8b3c5 100644
--- a/drivers/staging/comedi/drivers/ni_stc.h
+++ b/drivers/staging/comedi/drivers/ni_stc.h
@@ -326,6 +326,7 @@ static inline unsigned RTSI_Output_Bit(unsigned channel, int is_mseries)
{
unsigned max_channel;
unsigned base_bit_shift;
+
if (is_mseries) {
base_bit_shift = 8;
max_channel = 7;
@@ -1142,6 +1143,7 @@ static inline unsigned MSeries_AI_Config_Bank_Bits(enum ni_reg_type reg_type,
unsigned channel)
{
unsigned bits = channel & 0x30;
+
if (reg_type == ni_reg_622x) {
if (channel & 0x40)
bits |= 0x400;
@@ -1191,6 +1193,7 @@ enum MSeries_PLL_Control_Bits {
static inline unsigned MSeries_PLL_Divisor_Bits(unsigned divisor)
{
static const unsigned max_divisor = 0x10;
+
if (divisor < 1 || divisor > max_divisor) {
pr_err("%s: bug, invalid divisor=%i\n", __func__, divisor);
return 0;
@@ -1201,6 +1204,7 @@ static inline unsigned MSeries_PLL_Divisor_Bits(unsigned divisor)
static inline unsigned MSeries_PLL_Multiplier_Bits(unsigned multiplier)
{
static const unsigned max_multiplier = 0x100;
+
if (multiplier < 1 || multiplier > max_multiplier) {
pr_err("%s: bug, invalid multiplier=%i\n", __func__,
multiplier);
--
1.9.1
next prev parent reply other threads:[~2014-12-28 18:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-28 18:56 comedi: checkpatch errors/warnings Andreas Siegling
2014-12-28 18:56 ` [PATCH 1/3] comedi: checkpatch error: tabs instead of spaces Andreas Siegling
2014-12-30 22:40 ` Ian Abbott
2014-12-28 18:56 ` [PATCH 2/3] comedi: checkpatch error/warning: spaces Andreas Siegling
2014-12-30 22:51 ` Ian Abbott
2014-12-28 18:56 ` Andreas Siegling [this message]
2014-12-30 22:52 ` [PATCH 3/3] comedi: checkpatch warning: missing blank line Ian Abbott
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1419792975-31519-4-git-send-email-andreas.siegling@fau.de \
--to=andreas.siegling@fau.de \
--cc=abbotti@mev.co.uk \
--cc=chase.southwood@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=devel@linuxdriverproject.org \
--cc=ebru.akagunduz@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hsweeten@visionengravers.com \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=lvzhutao@gmail.com \
--cc=rickard_strandqvist@spectrumdigital.se \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®