From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org
Cc: lars@metafoo.de, denis.ciocca@st.com,
Jonathan Cameron <jic23@kernel.org>
Subject: [PATCH 04/10] iio:magn:st_magn move header from linux/iio/magn/ to .
Date: Tue, 22 Jan 2013 16:16:33 +0000 [thread overview]
Message-ID: <1358871399-11216-5-git-send-email-jic23@kernel.org> (raw)
In-Reply-To: <1358871399-11216-1-git-send-email-jic23@kernel.org>
---
drivers/iio/magnetometer/st_magn_buffer.c | 3 +-
drivers/iio/magnetometer/st_magn_core.c | 2 +-
drivers/iio/magnetometer/st_magn_i2c.c | 2 +-
drivers/iio/magnetometer/st_magn_spi.c | 2 +-
include/linux/iio/magnetometer/st_magn.h | 47 -------------------------------
5 files changed, 4 insertions(+), 52 deletions(-)
delete mode 100644 include/linux/iio/magnetometer/st_magn.h
diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c
index c396988..06bf621 100644
--- a/drivers/iio/magnetometer/st_magn_buffer.c
+++ b/drivers/iio/magnetometer/st_magn_buffer.c
@@ -21,9 +21,8 @@
#include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h>
-#include <linux/iio/magnetometer/st_magn.h>
#include <linux/iio/common/st_sensors.h>
-
+#include "st_magn.h"
static int st_magn_buffer_preenable(struct iio_dev *indio_dev)
{
diff --git a/drivers/iio/magnetometer/st_magn_core.c b/drivers/iio/magnetometer/st_magn_core.c
index eef9a32..845f5db 100644
--- a/drivers/iio/magnetometer/st_magn_core.c
+++ b/drivers/iio/magnetometer/st_magn_core.c
@@ -24,8 +24,8 @@
#include <linux/iio/trigger_consumer.h>
#include <linux/iio/buffer.h>
-#include <linux/iio/magnetometer/st_magn.h>
#include <linux/iio/common/st_sensors.h>
+#include "st_magn.h"
/* DEFAULT VALUE FOR SENSORS */
diff --git a/drivers/iio/magnetometer/st_magn_i2c.c b/drivers/iio/magnetometer/st_magn_i2c.c
index cc6eaa9..710b256a5 100644
--- a/drivers/iio/magnetometer/st_magn_i2c.c
+++ b/drivers/iio/magnetometer/st_magn_i2c.c
@@ -15,9 +15,9 @@
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
-#include <linux/iio/magnetometer/st_magn.h>
#include <linux/iio/common/st_sensors.h>
#include <linux/iio/common/st_sensors_i2c.h>
+#include "st_magn.h"
static int st_magn_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id)
diff --git a/drivers/iio/magnetometer/st_magn_spi.c b/drivers/iio/magnetometer/st_magn_spi.c
index bbd1baf..94547e7 100644
--- a/drivers/iio/magnetometer/st_magn_spi.c
+++ b/drivers/iio/magnetometer/st_magn_spi.c
@@ -15,9 +15,9 @@
#include <linux/iio/iio.h>
#include <linux/iio/trigger.h>
-#include <linux/iio/magnetometer/st_magn.h>
#include <linux/iio/common/st_sensors.h>
#include <linux/iio/common/st_sensors_spi.h>
+#include "st_magn.h"
static int st_magn_spi_probe(struct spi_device *spi)
{
diff --git a/include/linux/iio/magnetometer/st_magn.h b/include/linux/iio/magnetometer/st_magn.h
deleted file mode 100644
index cde476e..0000000
--- a/include/linux/iio/magnetometer/st_magn.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * STMicroelectronics magnetometers driver
- *
- * Copyright 2012-2013 STMicroelectronics Inc.
- *
- * Denis Ciocca <denis.ciocca@st.com>
- * v. 1.0.0
- * Licensed under the GPL-2.
- */
-
-#ifndef ST_MAGN_H
-#define ST_MAGN_H
-
-#include <linux/types.h>
-#include "../common/st_sensors.h"
-
-#define LSM303DLHC_MAGN_DEV_NAME "lsm303dlhc_magn"
-#define LSM303DLM_MAGN_DEV_NAME "lsm303dlm_magn"
-#define LIS3MDL_MAGN_DEV_NAME "lis3mdl"
-
-int st_magn_common_probe(struct iio_dev *indio_dev);
-void st_magn_common_remove(struct iio_dev *indio_dev);
-int st_magn_set_axis_enable(struct iio_dev *indio_dev, u8 active_bit);
-int st_magn_set_enable(struct iio_dev *indio_dev, bool enable);
-
-#ifdef CONFIG_IIO_BUFFER
-int st_magn_allocate_ring(struct iio_dev *indio_dev);
-void st_magn_deallocate_ring(struct iio_dev *indio_dev);
-#else /* CONFIG_IIO_BUFFER */
-static inline int st_magn_probe_trigger(struct iio_dev *indio_dev, int irq)
-{
- return 0;
-}
-static inline void st_magn_remove_trigger(struct iio_dev *indio_dev, int irq)
-{
- return;
-}
-static inline int st_magn_allocate_ring(struct iio_dev *indio_dev)
-{
- return 0;
-}
-static inline void st_magn_deallocate_ring(struct iio_dev *indio_dev)
-{
-}
-#endif /* CONFIG_IIO_BUFFER */
-
-#endif /* ST_MAGN_H */
--
1.8.1.1
next prev parent reply other threads:[~2013-01-22 16:16 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-21 8:36 STMicroelectronics driver kconfig-makefile bugfix Denis CIOCCA
2013-01-21 8:36 ` [PATCH 1/4] iio:common: Add STMicroelectronics common library Denis CIOCCA
2013-01-22 16:15 ` Jonathan Cameron
2013-01-22 16:16 ` [PATCH 00/10] Some little cleanups and fixlets for the ST sensor drivers Jonathan Cameron
2013-01-22 16:16 ` [PATCH 01/10] iio:st_sensors drop some unused exports Jonathan Cameron
2013-01-22 16:16 ` [PATCH 02/10] iio:accel:st_accel move the header from include/iio/common to Jonathan Cameron
2013-01-22 16:16 ` [PATCH 03/10] iio:gyro:st_gyro move header from linux/iio/gyro to Jonathan Cameron
2013-01-22 16:16 ` Jonathan Cameron [this message]
2013-01-22 16:16 ` [PATCH 05/10] iio:accel:st_accel drop unwanted EXPORT_SYMBOLS Jonathan Cameron
2013-01-22 16:16 ` [PATCH 06/10] iio:gyro:st_gyro drop unwanted EXPORT_SYMBOLs Jonathan Cameron
2013-01-22 16:16 ` [PATCH 07/10] iio:magn:st_magn " Jonathan Cameron
2013-01-22 16:16 ` [PATCH 08/10] iio:accel:st_accel drop incorrect line from kconfig comment Jonathan Cameron
2013-01-22 16:16 ` [PATCH 09/10] iio:gyro:st_gyro " Jonathan Cameron
2013-01-22 16:16 ` [PATCH 10/10] iio:magn:st_magn drop incorrect line from Kconfig Jonathan Cameron
2013-01-23 9:33 ` [PATCH 1/4] iio:common: Add STMicroelectronics common library Lars-Peter Clausen
2013-01-21 8:36 ` [PATCH 2/4] iio:accel: Add STMicroelectronics accelerometers driver Denis CIOCCA
2013-01-23 9:45 ` Lars-Peter Clausen
2013-01-21 8:36 ` [PATCH 3/4] iio:gyro: Add STMicroelectronics gyroscopes driver Denis CIOCCA
2013-01-21 8:36 ` [PATCH 4/4] iio:magnetometer: Add STMicroelectronics magnetometers driver Denis CIOCCA
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=1358871399-11216-5-git-send-email-jic23@kernel.org \
--to=jic23@kernel.org \
--cc=denis.ciocca@st.com \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).