* [PATCH v2 1/2] staging: iio: meter: ade7753: Move header content to implementation file
[not found] <cover.1488553341.git.kdunne@mail.ccsf.edu>
@ 2017-03-03 15:35 ` Katie Dunne
2017-03-04 17:34 ` Jonathan Cameron
2017-03-03 15:38 ` [PATCH v2 2/2] staging: iio: meter: ade7753: Clean up includes Katie Dunne
1 sibling, 1 reply; 4+ messages in thread
From: Katie Dunne @ 2017-03-03 15:35 UTC (permalink / raw)
To: outreachy-kernel; +Cc: jic23, knaack.h, lars, pmeerw, gregkh, linux-iio
The contents of ade7753.h are only used in ade7753.c. Move the header
contents to the implementation file and delete the header file.
Signed-off-by: Katie Dunne <kdunne@mail.ccsf.edu>
---
drivers/staging/iio/meter/ade7753.c | 69 ++++++++++++++++++++++++++++++++++-
drivers/staging/iio/meter/ade7753.h | 72 -------------------------------------
2 files changed, 68 insertions(+), 73 deletions(-)
delete mode 100644 drivers/staging/iio/meter/ade7753.h
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 671dc99..063ff27 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -21,7 +21,74 @@
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
#include "meter.h"
-#include "ade7753.h"
+
+#define ADE7753_WAVEFORM 0x01
+#define ADE7753_AENERGY 0x02
+#define ADE7753_RAENERGY 0x03
+#define ADE7753_LAENERGY 0x04
+#define ADE7753_VAENERGY 0x05
+#define ADE7753_RVAENERGY 0x06
+#define ADE7753_LVAENERGY 0x07
+#define ADE7753_LVARENERGY 0x08
+#define ADE7753_MODE 0x09
+#define ADE7753_IRQEN 0x0A
+#define ADE7753_STATUS 0x0B
+#define ADE7753_RSTSTATUS 0x0C
+#define ADE7753_CH1OS 0x0D
+#define ADE7753_CH2OS 0x0E
+#define ADE7753_GAIN 0x0F
+#define ADE7753_PHCAL 0x10
+#define ADE7753_APOS 0x11
+#define ADE7753_WGAIN 0x12
+#define ADE7753_WDIV 0x13
+#define ADE7753_CFNUM 0x14
+#define ADE7753_CFDEN 0x15
+#define ADE7753_IRMS 0x16
+#define ADE7753_VRMS 0x17
+#define ADE7753_IRMSOS 0x18
+#define ADE7753_VRMSOS 0x19
+#define ADE7753_VAGAIN 0x1A
+#define ADE7753_VADIV 0x1B
+#define ADE7753_LINECYC 0x1C
+#define ADE7753_ZXTOUT 0x1D
+#define ADE7753_SAGCYC 0x1E
+#define ADE7753_SAGLVL 0x1F
+#define ADE7753_IPKLVL 0x20
+#define ADE7753_VPKLVL 0x21
+#define ADE7753_IPEAK 0x22
+#define ADE7753_RSTIPEAK 0x23
+#define ADE7753_VPEAK 0x24
+#define ADE7753_RSTVPEAK 0x25
+#define ADE7753_TEMP 0x26
+#define ADE7753_PERIOD 0x27
+#define ADE7753_TMODE 0x3D
+#define ADE7753_CHKSUM 0x3E
+#define ADE7753_DIEREV 0x3F
+
+#define ADE7753_READ_REG(a) a
+#define ADE7753_WRITE_REG(a) ((a) | 0x80)
+
+#define ADE7753_MAX_TX 4
+#define ADE7753_MAX_RX 4
+#define ADE7753_STARTUP_DELAY 1000
+
+#define ADE7753_SPI_SLOW (u32)(300 * 1000)
+#define ADE7753_SPI_BURST (u32)(1000 * 1000)
+#define ADE7753_SPI_FAST (u32)(2000 * 1000)
+
+/**
+ * struct ade7753_state - device instance specific data
+ * @us: actual spi_device
+ * @tx: transmit buffer
+ * @rx: receive buffer
+ * @buf_lock: mutex to protect tx and rx
+ **/
+struct ade7753_state {
+ struct spi_device *us;
+ struct mutex buf_lock;
+ u8 tx[ADE7753_MAX_TX] ____cacheline_aligned;
+ u8 rx[ADE7753_MAX_RX];
+};
static int ade7753_spi_write_reg_8(struct device *dev,
u8 reg_address,
diff --git a/drivers/staging/iio/meter/ade7753.h b/drivers/staging/iio/meter/ade7753.h
deleted file mode 100644
index bfe7491..0000000
--- a/drivers/staging/iio/meter/ade7753.h
+++ /dev/null
@@ -1,72 +0,0 @@
-#ifndef _ADE7753_H
-#define _ADE7753_H
-
-#define ADE7753_WAVEFORM 0x01
-#define ADE7753_AENERGY 0x02
-#define ADE7753_RAENERGY 0x03
-#define ADE7753_LAENERGY 0x04
-#define ADE7753_VAENERGY 0x05
-#define ADE7753_RVAENERGY 0x06
-#define ADE7753_LVAENERGY 0x07
-#define ADE7753_LVARENERGY 0x08
-#define ADE7753_MODE 0x09
-#define ADE7753_IRQEN 0x0A
-#define ADE7753_STATUS 0x0B
-#define ADE7753_RSTSTATUS 0x0C
-#define ADE7753_CH1OS 0x0D
-#define ADE7753_CH2OS 0x0E
-#define ADE7753_GAIN 0x0F
-#define ADE7753_PHCAL 0x10
-#define ADE7753_APOS 0x11
-#define ADE7753_WGAIN 0x12
-#define ADE7753_WDIV 0x13
-#define ADE7753_CFNUM 0x14
-#define ADE7753_CFDEN 0x15
-#define ADE7753_IRMS 0x16
-#define ADE7753_VRMS 0x17
-#define ADE7753_IRMSOS 0x18
-#define ADE7753_VRMSOS 0x19
-#define ADE7753_VAGAIN 0x1A
-#define ADE7753_VADIV 0x1B
-#define ADE7753_LINECYC 0x1C
-#define ADE7753_ZXTOUT 0x1D
-#define ADE7753_SAGCYC 0x1E
-#define ADE7753_SAGLVL 0x1F
-#define ADE7753_IPKLVL 0x20
-#define ADE7753_VPKLVL 0x21
-#define ADE7753_IPEAK 0x22
-#define ADE7753_RSTIPEAK 0x23
-#define ADE7753_VPEAK 0x24
-#define ADE7753_RSTVPEAK 0x25
-#define ADE7753_TEMP 0x26
-#define ADE7753_PERIOD 0x27
-#define ADE7753_TMODE 0x3D
-#define ADE7753_CHKSUM 0x3E
-#define ADE7753_DIEREV 0x3F
-
-#define ADE7753_READ_REG(a) a
-#define ADE7753_WRITE_REG(a) ((a) | 0x80)
-
-#define ADE7753_MAX_TX 4
-#define ADE7753_MAX_RX 4
-#define ADE7753_STARTUP_DELAY 1000
-
-#define ADE7753_SPI_SLOW (u32)(300 * 1000)
-#define ADE7753_SPI_BURST (u32)(1000 * 1000)
-#define ADE7753_SPI_FAST (u32)(2000 * 1000)
-
-/**
- * struct ade7753_state - device instance specific data
- * @us: actual spi_device
- * @tx: transmit buffer
- * @rx: receive buffer
- * @buf_lock: mutex to protect tx and rx
- **/
-struct ade7753_state {
- struct spi_device *us;
- struct mutex buf_lock;
- u8 tx[ADE7753_MAX_TX] ____cacheline_aligned;
- u8 rx[ADE7753_MAX_RX];
-};
-
-#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] staging: iio: meter: ade7753: Clean up includes
[not found] <cover.1488553341.git.kdunne@mail.ccsf.edu>
2017-03-03 15:35 ` [PATCH v2 1/2] staging: iio: meter: ade7753: Move header content to implementation file Katie Dunne
@ 2017-03-03 15:38 ` Katie Dunne
2017-03-04 17:35 ` Jonathan Cameron
1 sibling, 1 reply; 4+ messages in thread
From: Katie Dunne @ 2017-03-03 15:38 UTC (permalink / raw)
To: outreachy-kernel; +Cc: jic23, knaack.h, lars, pmeerw, gregkh, linux-iio
Alphabetize header files.
Signed-off-by: Katie Dunne <kdunne@mail.ccsf.edu>
---
drivers/staging/iio/meter/ade7753.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
index 063ff27..dfd8b71 100644
--- a/drivers/staging/iio/meter/ade7753.c
+++ b/drivers/staging/iio/meter/ade7753.c
@@ -6,20 +6,19 @@
* Licensed under the GPL-2 or later.
*/
-#include <linux/interrupt.h>
-#include <linux/irq.h>
#include <linux/delay.h>
-#include <linux/mutex.h>
#include <linux/device.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
#include <linux/kernel.h>
-#include <linux/spi/spi.h>
-#include <linux/slab.h>
-#include <linux/sysfs.h>
#include <linux/list.h>
#include <linux/module.h>
-
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/sysfs.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
+#include <linux/spi/spi.h>
#include "meter.h"
#define ADE7753_WAVEFORM 0x01
--
2.7.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] staging: iio: meter: ade7753: Move header content to implementation file
2017-03-03 15:35 ` [PATCH v2 1/2] staging: iio: meter: ade7753: Move header content to implementation file Katie Dunne
@ 2017-03-04 17:34 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2017-03-04 17:34 UTC (permalink / raw)
To: Katie Dunne, outreachy-kernel; +Cc: knaack.h, lars, pmeerw, gregkh, linux-iio
On 03/03/17 15:35, Katie Dunne wrote:
> The contents of ade7753.h are only used in ade7753.c. Move the header
> contents to the implementation file and delete the header file.
>
> Signed-off-by: Katie Dunne <kdunne@mail.ccsf.edu>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders
to play with it.
Thanks,
Jonathan
> ---
> drivers/staging/iio/meter/ade7753.c | 69 ++++++++++++++++++++++++++++++++++-
> drivers/staging/iio/meter/ade7753.h | 72 -------------------------------------
> 2 files changed, 68 insertions(+), 73 deletions(-)
> delete mode 100644 drivers/staging/iio/meter/ade7753.h
>
> diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
> index 671dc99..063ff27 100644
> --- a/drivers/staging/iio/meter/ade7753.c
> +++ b/drivers/staging/iio/meter/ade7753.c
> @@ -21,7 +21,74 @@
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> #include "meter.h"
> -#include "ade7753.h"
> +
> +#define ADE7753_WAVEFORM 0x01
> +#define ADE7753_AENERGY 0x02
> +#define ADE7753_RAENERGY 0x03
> +#define ADE7753_LAENERGY 0x04
> +#define ADE7753_VAENERGY 0x05
> +#define ADE7753_RVAENERGY 0x06
> +#define ADE7753_LVAENERGY 0x07
> +#define ADE7753_LVARENERGY 0x08
> +#define ADE7753_MODE 0x09
> +#define ADE7753_IRQEN 0x0A
> +#define ADE7753_STATUS 0x0B
> +#define ADE7753_RSTSTATUS 0x0C
> +#define ADE7753_CH1OS 0x0D
> +#define ADE7753_CH2OS 0x0E
> +#define ADE7753_GAIN 0x0F
> +#define ADE7753_PHCAL 0x10
> +#define ADE7753_APOS 0x11
> +#define ADE7753_WGAIN 0x12
> +#define ADE7753_WDIV 0x13
> +#define ADE7753_CFNUM 0x14
> +#define ADE7753_CFDEN 0x15
> +#define ADE7753_IRMS 0x16
> +#define ADE7753_VRMS 0x17
> +#define ADE7753_IRMSOS 0x18
> +#define ADE7753_VRMSOS 0x19
> +#define ADE7753_VAGAIN 0x1A
> +#define ADE7753_VADIV 0x1B
> +#define ADE7753_LINECYC 0x1C
> +#define ADE7753_ZXTOUT 0x1D
> +#define ADE7753_SAGCYC 0x1E
> +#define ADE7753_SAGLVL 0x1F
> +#define ADE7753_IPKLVL 0x20
> +#define ADE7753_VPKLVL 0x21
> +#define ADE7753_IPEAK 0x22
> +#define ADE7753_RSTIPEAK 0x23
> +#define ADE7753_VPEAK 0x24
> +#define ADE7753_RSTVPEAK 0x25
> +#define ADE7753_TEMP 0x26
> +#define ADE7753_PERIOD 0x27
> +#define ADE7753_TMODE 0x3D
> +#define ADE7753_CHKSUM 0x3E
> +#define ADE7753_DIEREV 0x3F
> +
> +#define ADE7753_READ_REG(a) a
> +#define ADE7753_WRITE_REG(a) ((a) | 0x80)
> +
> +#define ADE7753_MAX_TX 4
> +#define ADE7753_MAX_RX 4
> +#define ADE7753_STARTUP_DELAY 1000
> +
> +#define ADE7753_SPI_SLOW (u32)(300 * 1000)
> +#define ADE7753_SPI_BURST (u32)(1000 * 1000)
> +#define ADE7753_SPI_FAST (u32)(2000 * 1000)
> +
> +/**
> + * struct ade7753_state - device instance specific data
> + * @us: actual spi_device
> + * @tx: transmit buffer
> + * @rx: receive buffer
> + * @buf_lock: mutex to protect tx and rx
> + **/
> +struct ade7753_state {
> + struct spi_device *us;
> + struct mutex buf_lock;
> + u8 tx[ADE7753_MAX_TX] ____cacheline_aligned;
> + u8 rx[ADE7753_MAX_RX];
> +};
>
> static int ade7753_spi_write_reg_8(struct device *dev,
> u8 reg_address,
> diff --git a/drivers/staging/iio/meter/ade7753.h b/drivers/staging/iio/meter/ade7753.h
> deleted file mode 100644
> index bfe7491..0000000
> --- a/drivers/staging/iio/meter/ade7753.h
> +++ /dev/null
> @@ -1,72 +0,0 @@
> -#ifndef _ADE7753_H
> -#define _ADE7753_H
> -
> -#define ADE7753_WAVEFORM 0x01
> -#define ADE7753_AENERGY 0x02
> -#define ADE7753_RAENERGY 0x03
> -#define ADE7753_LAENERGY 0x04
> -#define ADE7753_VAENERGY 0x05
> -#define ADE7753_RVAENERGY 0x06
> -#define ADE7753_LVAENERGY 0x07
> -#define ADE7753_LVARENERGY 0x08
> -#define ADE7753_MODE 0x09
> -#define ADE7753_IRQEN 0x0A
> -#define ADE7753_STATUS 0x0B
> -#define ADE7753_RSTSTATUS 0x0C
> -#define ADE7753_CH1OS 0x0D
> -#define ADE7753_CH2OS 0x0E
> -#define ADE7753_GAIN 0x0F
> -#define ADE7753_PHCAL 0x10
> -#define ADE7753_APOS 0x11
> -#define ADE7753_WGAIN 0x12
> -#define ADE7753_WDIV 0x13
> -#define ADE7753_CFNUM 0x14
> -#define ADE7753_CFDEN 0x15
> -#define ADE7753_IRMS 0x16
> -#define ADE7753_VRMS 0x17
> -#define ADE7753_IRMSOS 0x18
> -#define ADE7753_VRMSOS 0x19
> -#define ADE7753_VAGAIN 0x1A
> -#define ADE7753_VADIV 0x1B
> -#define ADE7753_LINECYC 0x1C
> -#define ADE7753_ZXTOUT 0x1D
> -#define ADE7753_SAGCYC 0x1E
> -#define ADE7753_SAGLVL 0x1F
> -#define ADE7753_IPKLVL 0x20
> -#define ADE7753_VPKLVL 0x21
> -#define ADE7753_IPEAK 0x22
> -#define ADE7753_RSTIPEAK 0x23
> -#define ADE7753_VPEAK 0x24
> -#define ADE7753_RSTVPEAK 0x25
> -#define ADE7753_TEMP 0x26
> -#define ADE7753_PERIOD 0x27
> -#define ADE7753_TMODE 0x3D
> -#define ADE7753_CHKSUM 0x3E
> -#define ADE7753_DIEREV 0x3F
> -
> -#define ADE7753_READ_REG(a) a
> -#define ADE7753_WRITE_REG(a) ((a) | 0x80)
> -
> -#define ADE7753_MAX_TX 4
> -#define ADE7753_MAX_RX 4
> -#define ADE7753_STARTUP_DELAY 1000
> -
> -#define ADE7753_SPI_SLOW (u32)(300 * 1000)
> -#define ADE7753_SPI_BURST (u32)(1000 * 1000)
> -#define ADE7753_SPI_FAST (u32)(2000 * 1000)
> -
> -/**
> - * struct ade7753_state - device instance specific data
> - * @us: actual spi_device
> - * @tx: transmit buffer
> - * @rx: receive buffer
> - * @buf_lock: mutex to protect tx and rx
> - **/
> -struct ade7753_state {
> - struct spi_device *us;
> - struct mutex buf_lock;
> - u8 tx[ADE7753_MAX_TX] ____cacheline_aligned;
> - u8 rx[ADE7753_MAX_RX];
> -};
> -
> -#endif
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 2/2] staging: iio: meter: ade7753: Clean up includes
2017-03-03 15:38 ` [PATCH v2 2/2] staging: iio: meter: ade7753: Clean up includes Katie Dunne
@ 2017-03-04 17:35 ` Jonathan Cameron
0 siblings, 0 replies; 4+ messages in thread
From: Jonathan Cameron @ 2017-03-04 17:35 UTC (permalink / raw)
To: Katie Dunne, outreachy-kernel; +Cc: knaack.h, lars, pmeerw, gregkh, linux-iio
On 03/03/17 15:38, Katie Dunne wrote:
> Alphabetize header files.
>
> Signed-off-by: Katie Dunne <kdunne@mail.ccsf.edu>
Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders
to play with it.
Thanks,
Jonathan
> ---
> drivers/staging/iio/meter/ade7753.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/staging/iio/meter/ade7753.c b/drivers/staging/iio/meter/ade7753.c
> index 063ff27..dfd8b71 100644
> --- a/drivers/staging/iio/meter/ade7753.c
> +++ b/drivers/staging/iio/meter/ade7753.c
> @@ -6,20 +6,19 @@
> * Licensed under the GPL-2 or later.
> */
>
> -#include <linux/interrupt.h>
> -#include <linux/irq.h>
> #include <linux/delay.h>
> -#include <linux/mutex.h>
> #include <linux/device.h>
> +#include <linux/interrupt.h>
> +#include <linux/irq.h>
> #include <linux/kernel.h>
> -#include <linux/spi/spi.h>
> -#include <linux/slab.h>
> -#include <linux/sysfs.h>
> #include <linux/list.h>
> #include <linux/module.h>
> -
> +#include <linux/mutex.h>
> +#include <linux/slab.h>
> +#include <linux/sysfs.h>
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> +#include <linux/spi/spi.h>
> #include "meter.h"
>
> #define ADE7753_WAVEFORM 0x01
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-03-04 17:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <cover.1488553341.git.kdunne@mail.ccsf.edu>
2017-03-03 15:35 ` [PATCH v2 1/2] staging: iio: meter: ade7753: Move header content to implementation file Katie Dunne
2017-03-04 17:34 ` Jonathan Cameron
2017-03-03 15:38 ` [PATCH v2 2/2] staging: iio: meter: ade7753: Clean up includes Katie Dunne
2017-03-04 17:35 ` Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.