nfc: st-nci: Add macro for gpio name

Add macro definition for each gpio string for an easier code
maintenance.

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 e0a512e4f0e6ad6c4c87422b15368ef20e9924fb..0e6e3b22e24a6df5bd1626355e14f3cea0378832 100644 (file)
--- a/drivers/nfc/st-nci/i2c.c
+++ b/drivers/nfc/st-nci/i2c.c
@@ -40,6 +40,7 @@
 
 #define ST_NCI_I2C_DRIVER_NAME "st_nci_i2c"
 
+#define ST_NCI_GPIO_NAME_RESET "clf_reset"
 
 struct st_nci_i2c_phy {
        struct i2c_client *i2c_dev;
@@ -226,7 +227,7 @@ static int st_nci_i2c_of_request_resources(struct i2c_client *client)
 
        /* GPIO request and configuration */
        r = devm_gpio_request_one(&client->dev, gpio,
-                               GPIOF_OUT_INIT_HIGH, "clf_reset");
+                               GPIOF_OUT_INIT_HIGH, ST_NCI_GPIO_NAME_RESET);
        if (r) {
                nfc_err(&client->dev, "Failed to request reset pin\n");
                return r;
@@ -260,7 +261,8 @@ static int st_nci_i2c_request_resources(struct i2c_client *client)
        phy->irq_polarity = pdata->irq_polarity;
 
        r = devm_gpio_request_one(&client->dev,
-                       phy->gpio_reset, GPIOF_OUT_INIT_HIGH, "clf_reset");
+                       phy->gpio_reset, GPIOF_OUT_INIT_HIGH,
+                       ST_NCI_GPIO_NAME_RESET);
        if (r) {
                pr_err("%s : reset gpio_request failed\n", __FILE__);
                return r;

diff --git a/drivers/nfc/st-nci/spi.c b/drivers/nfc/st-nci/spi.c
index c378dd0c798cfeb52543576746dd90194c53f7cb..7c3684b84cb86c57c254ed4b5bc6dd1ab0d6b398 100644 (file)
--- a/drivers/nfc/st-nci/spi.c
+++ b/drivers/nfc/st-nci/spi.c
@@ -41,6 +41,8 @@
 
 #define ST_NCI_SPI_DRIVER_NAME "st_nci_spi"
 
+#define ST_NCI_GPIO_NAME_RESET "clf_reset"
+
 struct st_nci_spi_phy {
        struct spi_device *spi_dev;
        struct llt_ndlc *ndlc;
@@ -240,7 +242,7 @@ static int st_nci_spi_of_request_resources(struct spi_device *dev)
 
        /* GPIO request and configuration */
        r = devm_gpio_request_one(&dev->dev, gpio,
-                               GPIOF_OUT_INIT_HIGH, "clf_reset");
+                               GPIOF_OUT_INIT_HIGH, ST_NCI_GPIO_NAME_RESET);
        if (r) {
                nfc_err(&dev->dev, "Failed to request reset pin\n");
                return r;
@@ -274,7 +276,8 @@ static int st_nci_spi_request_resources(struct spi_device *dev)
        phy->irq_polarity = pdata->irq_polarity;
 
        r = devm_gpio_request_one(&dev->dev,
-                       phy->gpio_reset, GPIOF_OUT_INIT_HIGH, "clf_reset");
+                       phy->gpio_reset, GPIOF_OUT_INIT_HIGH,
+                       ST_NCI_GPIO_NAME_RESET);
        if (r) {
                pr_err("%s : reset gpio_request failed\n", __FILE__);
                return r;