diff options
Diffstat (limited to 'drivers/gpio/gpio-thunderx.c')
| -rw-r--r-- | drivers/gpio/gpio-thunderx.c | 17 | 
1 files changed, 6 insertions, 11 deletions
| diff --git a/drivers/gpio/gpio-thunderx.c b/drivers/gpio/gpio-thunderx.c index 9f66deab46ea..cc62c6e64103 100644 --- a/drivers/gpio/gpio-thunderx.c +++ b/drivers/gpio/gpio-thunderx.c @@ -15,8 +15,6 @@  #include <linux/module.h>  #include <linux/pci.h>  #include <linux/spinlock.h> -#include <asm-generic/msi.h> -  #define GPIO_RX_DAT	0x0  #define GPIO_TX_SET	0x8 @@ -408,18 +406,15 @@ static int thunderx_gpio_child_to_parent_hwirq(struct gpio_chip *gc,  	return 0;  } -static void *thunderx_gpio_populate_parent_alloc_info(struct gpio_chip *chip, -						      unsigned int parent_hwirq, -						      unsigned int parent_type) +static int thunderx_gpio_populate_parent_alloc_info(struct gpio_chip *chip, +						    union gpio_irq_fwspec *gfwspec, +						    unsigned int parent_hwirq, +						    unsigned int parent_type)  { -	msi_alloc_info_t *info; - -	info = kmalloc(sizeof(*info), GFP_KERNEL); -	if (!info) -		return NULL; +	msi_alloc_info_t *info = &gfwspec->msiinfo;  	info->hwirq = parent_hwirq; -	return info; +	return 0;  }  static int thunderx_gpio_probe(struct pci_dev *pdev, |