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>

diff --git a/drivers/nfc/st-nci/i2c.c b/drivers/nfc/st-nci/i2c.c
index a4b49e054ea2a3745e9472b81becd2364bc5e879..e0a512e4f0e6ad6c4c87422b15368ef20e9924fb 100644 (file)
--- 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 0ab40cb335ad08c1c24ea41b9d1b28e40619d140..c378dd0c798cfeb52543576746dd90194c53f7cb 100644 (file)
--- 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", },
        {}