mm/migrate: correct failure handling if !hugepage_migration_support()

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-intel-mid.c

diff --git a/drivers/gpio/gpio-intel-mid.c b/drivers/gpio/gpio-intel-mid.c
index 039de0e6cf162c2c2259807a65001bbd90c38871..d1b50ef5fab86928346ac741e7cbfc1c40d64ea0 100644 (file)
--- a/drivers/gpio/gpio-intel-mid.c
+++ b/drivers/gpio/gpio-intel-mid.c
@@ -297,7 +297,7 @@ static const struct intel_mid_gpio_ddata gpio_tangier = {
        .chip_irq_type = INTEL_MID_IRQ_TYPE_EDGE,
 };
 
-static DEFINE_PCI_DEVICE_TABLE(intel_gpio_ids) = {
+static const struct pci_device_id intel_gpio_ids[] = {
        {
                /* Lincroft */
                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x080f),
@@ -380,8 +380,7 @@ static int intel_gpio_irq_map(struct irq_domain *d, unsigned int irq,
 {
        struct intel_mid_gpio *priv = d->host_data;
 
-       irq_set_chip_and_handler_name(irq, &intel_mid_irqchip,
-                                     handle_simple_irq, "demux");
+       irq_set_chip_and_handler(irq, &intel_mid_irqchip, handle_simple_irq);
        irq_set_chip_data(irq, priv);
        irq_set_irq_type(irq, IRQ_TYPE_NONE);
 
@@ -449,7 +448,7 @@ static int intel_gpio_probe(struct pci_dev *pdev,
        priv->chip.to_irq = intel_gpio_to_irq;
        priv->chip.base = gpio_base;
        priv->chip.ngpio = ddata->ngpio;
-       priv->chip.can_sleep = 0;
+       priv->chip.can_sleep = false;
        priv->pdev = pdev;
 
        spin_lock_init(&priv->lock);