Merge tag 'mfd-for-linus-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[sfrench/cifs-2.6.git] / drivers / mfd / intel_quark_i2c_gpio.c

diff --git a/drivers/mfd/intel_quark_i2c_gpio.c b/drivers/mfd/intel_quark_i2c_gpio.c
index ce17ae8a81c922820b3f6c7fbeda81b49d1dbb8b..7946d6e38b87201e3904f3247d2807c2ed174ca4 100644 (file)
--- a/drivers/mfd/intel_quark_i2c_gpio.c
+++ b/drivers/mfd/intel_quark_i2c_gpio.c
@@ -220,8 +220,7 @@ static int intel_quark_gpio_setup(struct pci_dev *pdev, struct mfd_cell *cell)
                return -ENOMEM;
 
        /* Set the properties for portA */
-       pdata->properties->node         = NULL;
-       pdata->properties->name         = "intel-quark-x1000-gpio-portA";
+       pdata->properties->fwnode       = NULL;
        pdata->properties->idx          = 0;
        pdata->properties->ngpio        = INTEL_QUARK_MFD_NGPIO;
        pdata->properties->gpio_base    = INTEL_QUARK_MFD_GPIO_BASE;