summaryrefslogtreecommitdiff
path: root/drivers/nfc/st-nci
diff options
context:
space:
mode:
authorChristophe Ricard <christophe.ricard@gmail.com>2015-12-24 01:45:05 +0300
committerSamuel Ortiz <sameo@linux.intel.com>2015-12-29 21:06:14 +0300
commit3252897f7a326a480e662c3b38a554fc35c6ad31 (patch)
treeff75ea3a014ce2be1514647c9e608b65cdc5f97b /drivers/nfc/st-nci
parenta21512d1b61c6aeeb05d74910078bc19059da87b (diff)
downloadlinux-3252897f7a326a480e662c3b38a554fc35c6ad31.tar.xz
nfc: st-nci: Group device table together
Group device table at the same place in order to make the code easier to read and parse. Signed-off-by: Christophe Ricard <christophe-h.ricard@st.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/nfc/st-nci')
-rw-r--r--drivers/nfc/st-nci/i2c.c11
-rw-r--r--drivers/nfc/st-nci/spi.c12
2 files changed, 12 insertions, 11 deletions
diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index a4b49e054ea2..e0a512e4f0e6 100644
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -40,11 +40,6 @@
#define ST_NCI_I2C_DRIVER_NAME "st_nci_i2c"
-static struct i2c_device_id st_nci_i2c_id_table[] = {
- {ST_NCI_DRIVER_NAME, 0},
- {}
-};
-MODULE_DEVICE_TABLE(i2c, st_nci_i2c_id_table);
struct st_nci_i2c_phy {
struct i2c_client *i2c_dev;
@@ -351,6 +346,12 @@ static int st_nci_i2c_remove(struct i2c_client *client)
return 0;
}
+static struct i2c_device_id st_nci_i2c_id_table[] = {
+ {ST_NCI_DRIVER_NAME, 0},
+ {}
+};
+MODULE_DEVICE_TABLE(i2c, st_nci_i2c_id_table);
+
static const struct of_device_id of_st_nci_i2c_match[] = {
{ .compatible = "st,st21nfcb-i2c", },
{ .compatible = "st,st21nfcb_i2c", },
diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index 0ab40cb335ad..c378dd0c798c 100644
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -41,12 +41,6 @@
#define ST_NCI_SPI_DRIVER_NAME "st_nci_spi"
-static struct spi_device_id st_nci_spi_id_table[] = {
- {ST_NCI_SPI_DRIVER_NAME, 0},
- {}
-};
-MODULE_DEVICE_TABLE(spi, st_nci_spi_id_table);
-
struct st_nci_spi_phy {
struct spi_device *spi_dev;
struct llt_ndlc *ndlc;
@@ -367,6 +361,12 @@ static int st_nci_spi_remove(struct spi_device *dev)
return 0;
}
+static struct spi_device_id st_nci_spi_id_table[] = {
+ {ST_NCI_SPI_DRIVER_NAME, 0},
+ {}
+};
+MODULE_DEVICE_TABLE(spi, st_nci_spi_id_table);
+
static const struct of_device_id of_st_nci_spi_match[] = {
{ .compatible = "st,st21nfcb-spi", },
{}