2019-10-06 18:51:04

by Jules Irenge

Subject: [PATCH] staging: comedi: Capitalize macro name to fix camelcase checkpatch warning

Capitalize RANGE_mA to fix camelcase check warning.
Issue reported by checkpatch.pl

Signed-off-by: Jules Irenge <[email protected]>
---
drivers/staging/comedi/comedidev.h | 2 +-
drivers/staging/comedi/drivers/adv_pci1724.c | 4 ++--
drivers/staging/comedi/drivers/dac02.c | 2 +-
drivers/staging/comedi/range.c | 6 +++---
4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 54c091866777..2fc536db203c 100644
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -603,7 +603,7 @@ int comedi_check_chanlist(struct comedi_subdevice *s,

#define RANGE(a, b) {(a) * 1e6, (b) * 1e6, 0}
#define RANGE_ext(a, b) {(a) * 1e6, (b) * 1e6, RF_EXTERNAL}
-#define RANGE_mA(a, b) {(a) * 1e6, (b) * 1e6, UNIT_MA}
+#define RANGE_MA(a, b) {(a) * 1e6, (b) * 1e6, UNIT_MA}
#define RANGE_unitless(a, b) {(a) * 1e6, (b) * 1e6, 0}
#define BIP_RANGE(a) {-(a) * 1e6, (a) * 1e6, 0}
#define UNI_RANGE(a) {0, (a) * 1e6, 0}
diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c
index e8ab573c839f..f20d710c19d3 100644
--- a/drivers/staging/comedi/drivers/adv_pci1724.c
+++ b/drivers/staging/comedi/drivers/adv_pci1724.c
@@ -64,8 +64,8 @@
static const struct comedi_lrange adv_pci1724_ao_ranges = {
4, {
BIP_RANGE(10),
- RANGE_mA(0, 20),
- RANGE_mA(4, 20),
+ RANGE_MA(0, 20),
+ RANGE_MA(4, 20),
RANGE_unitless(0, 1)
}
};
diff --git a/drivers/staging/comedi/drivers/dac02.c b/drivers/staging/comedi/drivers/dac02.c
index 5ef8114c2c85..4503cbdf673c 100644
--- a/drivers/staging/comedi/drivers/dac02.c
+++ b/drivers/staging/comedi/drivers/dac02.c
@@ -54,7 +54,7 @@ static const struct comedi_lrange das02_ao_ranges = {
UNI_RANGE(10),
BIP_RANGE(5),
BIP_RANGE(10),
- RANGE_mA(4, 20),
+ RANGE_MA(4, 20),
RANGE_ext(0, 1)
}
};
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index 89d599877445..dacdd7b6f1a0 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -23,11 +23,11 @@ const struct comedi_lrange range_unipolar5 = { 1, {UNI_RANGE(5)} };
EXPORT_SYMBOL_GPL(range_unipolar5);
const struct comedi_lrange range_unipolar2_5 = { 1, {UNI_RANGE(2.5)} };
EXPORT_SYMBOL_GPL(range_unipolar2_5);
-const struct comedi_lrange range_0_20mA = { 1, {RANGE_mA(0, 20)} };
+const struct comedi_lrange range_0_20mA = { 1, {RANGE_MA(0, 20)} };
EXPORT_SYMBOL_GPL(range_0_20mA);
-const struct comedi_lrange range_4_20mA = { 1, {RANGE_mA(4, 20)} };
+const struct comedi_lrange range_4_20mA = { 1, {RANGE_MA(4, 20)} };
EXPORT_SYMBOL_GPL(range_4_20mA);
-const struct comedi_lrange range_0_32mA = { 1, {RANGE_mA(0, 32)} };
+const struct comedi_lrange range_0_32mA = { 1, {RANGE_MA(0, 32)} };
EXPORT_SYMBOL_GPL(range_0_32mA);
const struct comedi_lrange range_unknown = { 1, {{0, 1000000, UNIT_none} } };
EXPORT_SYMBOL_GPL(range_unknown);
--
2.21.0

2019-10-06 19:04:51

by Julia Lawall

Subject: Re: [Outreachy kernel] [PATCH] staging: comedi: Capitalize macro name to fix camelcase checkpatch warning

On Sun, 6 Oct 2019, Jules Irenge wrote:

> Capitalize RANGE_mA to fix camelcase check warning.
> Issue reported by checkpatch.pl

I guess mA means something, so it would be better to keep it?

julia

>
> Signed-off-by: Jules Irenge <[email protected]>
> ---
> drivers/staging/comedi/comedidev.h | 2 +-
> drivers/staging/comedi/drivers/adv_pci1724.c | 4 ++--
> drivers/staging/comedi/drivers/dac02.c | 2 +-
> drivers/staging/comedi/range.c | 6 +++---
> 4 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
> index 54c091866777..2fc536db203c 100644
> --- a/drivers/staging/comedi/comedidev.h
> +++ b/drivers/staging/comedi/comedidev.h
> @@ -603,7 +603,7 @@ int comedi_check_chanlist(struct comedi_subdevice *s,
>
> #define RANGE(a, b) {(a) * 1e6, (b) * 1e6, 0}
> #define RANGE_ext(a, b) {(a) * 1e6, (b) * 1e6, RF_EXTERNAL}
> -#define RANGE_mA(a, b) {(a) * 1e6, (b) * 1e6, UNIT_MA}
> +#define RANGE_MA(a, b) {(a) * 1e6, (b) * 1e6, UNIT_MA}
> #define RANGE_unitless(a, b) {(a) * 1e6, (b) * 1e6, 0}
> #define BIP_RANGE(a) {-(a) * 1e6, (a) * 1e6, 0}
> #define UNI_RANGE(a) {0, (a) * 1e6, 0}
> diff --git a/drivers/staging/comedi/drivers/adv_pci1724.c b/drivers/staging/comedi/drivers/adv_pci1724.c
> index e8ab573c839f..f20d710c19d3 100644
> --- a/drivers/staging/comedi/drivers/adv_pci1724.c
> +++ b/drivers/staging/comedi/drivers/adv_pci1724.c
> @@ -64,8 +64,8 @@
> static const struct comedi_lrange adv_pci1724_ao_ranges = {
> 4, {
> BIP_RANGE(10),
> - RANGE_mA(0, 20),
> - RANGE_mA(4, 20),
> + RANGE_MA(0, 20),
> + RANGE_MA(4, 20),
> RANGE_unitless(0, 1)
> }
> };
> diff --git a/drivers/staging/comedi/drivers/dac02.c b/drivers/staging/comedi/drivers/dac02.c
> index 5ef8114c2c85..4503cbdf673c 100644
> --- a/drivers/staging/comedi/drivers/dac02.c
> +++ b/drivers/staging/comedi/drivers/dac02.c
> @@ -54,7 +54,7 @@ static const struct comedi_lrange das02_ao_ranges = {
> UNI_RANGE(10),
> BIP_RANGE(5),
> BIP_RANGE(10),
> - RANGE_mA(4, 20),
> + RANGE_MA(4, 20),
> RANGE_ext(0, 1)
> }
> };
> diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
> index 89d599877445..dacdd7b6f1a0 100644
> --- a/drivers/staging/comedi/range.c
> +++ b/drivers/staging/comedi/range.c
> @@ -23,11 +23,11 @@ const struct comedi_lrange range_unipolar5 = { 1, {UNI_RANGE(5)} };
> EXPORT_SYMBOL_GPL(range_unipolar5);
> const struct comedi_lrange range_unipolar2_5 = { 1, {UNI_RANGE(2.5)} };
> EXPORT_SYMBOL_GPL(range_unipolar2_5);
> -const struct comedi_lrange range_0_20mA = { 1, {RANGE_mA(0, 20)} };
> +const struct comedi_lrange range_0_20mA = { 1, {RANGE_MA(0, 20)} };
> EXPORT_SYMBOL_GPL(range_0_20mA);
> -const struct comedi_lrange range_4_20mA = { 1, {RANGE_mA(4, 20)} };
> +const struct comedi_lrange range_4_20mA = { 1, {RANGE_MA(4, 20)} };
> EXPORT_SYMBOL_GPL(range_4_20mA);
> -const struct comedi_lrange range_0_32mA = { 1, {RANGE_mA(0, 32)} };
> +const struct comedi_lrange range_0_32mA = { 1, {RANGE_MA(0, 32)} };
> EXPORT_SYMBOL_GPL(range_0_32mA);
> const struct comedi_lrange range_unknown = { 1, {{0, 1000000, UNIT_none} } };
> EXPORT_SYMBOL_GPL(range_unknown);
> --
> 2.21.0
>
> --
> You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
> To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20191006184827.12021-1-jbi.octave%40gmail.com.
>

2019-10-06 19:07:55

by Greg Kroah-Hartman

Subject: Re: [Outreachy kernel] [PATCH] staging: comedi: Capitalize macro name to fix camelcase checkpatch warning

On Sun, Oct 06, 2019 at 09:01:09PM +0200, Julia Lawall wrote:
>
>
> On Sun, 6 Oct 2019, Jules Irenge wrote:
>
> > Capitalize RANGE_mA to fix camelcase check warning.
> > Issue reported by checkpatch.pl
>
> I guess mA means something, so it would be better to keep it?

Yes it does, we need to keep it, sorry.

thanks,

greg k-h