Importing "grsecurity-3.1-3.19.2-201503201903.patch"

[people/ms/linux.git] / drivers / memory / omap-gpmc.c

diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c
index 24696f59215b6b819b44b92719c86afa381fec2e..3637780bd06f282dad3604da098082c5b55be4b4 100644 (file)
--- a/drivers/memory/omap-gpmc.c
+++ b/drivers/memory/omap-gpmc.c
@@ -211,7 +211,6 @@ struct omap3_gpmc_regs {
 };
 
 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
-static struct irq_chip gpmc_irq_chip;
 static int gpmc_irq_start;
 
 static struct resource gpmc_mem_root;
@@ -939,6 +938,17 @@ static void gpmc_irq_noop(struct irq_data *data) { }
 
 static unsigned int gpmc_irq_noop_ret(struct irq_data *data) { return 0; }
 
+static struct irq_chip gpmc_irq_chip = {
+       .name = "gpmc",
+       .irq_startup = gpmc_irq_noop_ret,
+       .irq_enable = gpmc_irq_enable,
+       .irq_disable = gpmc_irq_disable,
+       .irq_shutdown = gpmc_irq_noop,
+       .irq_ack = gpmc_irq_noop,
+       .irq_mask = gpmc_irq_noop,
+       .irq_unmask = gpmc_irq_noop,
+};
+
 static int gpmc_setup_irq(void)
 {
        int i;
@@ -953,15 +963,6 @@ static int gpmc_setup_irq(void)
                return gpmc_irq_start;
        }
 
-       gpmc_irq_chip.name = "gpmc";
-       gpmc_irq_chip.irq_startup = gpmc_irq_noop_ret;
-       gpmc_irq_chip.irq_enable = gpmc_irq_enable;
-       gpmc_irq_chip.irq_disable = gpmc_irq_disable;
-       gpmc_irq_chip.irq_shutdown = gpmc_irq_noop;
-       gpmc_irq_chip.irq_ack = gpmc_irq_noop;
-       gpmc_irq_chip.irq_mask = gpmc_irq_noop;
-       gpmc_irq_chip.irq_unmask = gpmc_irq_noop;
-
        gpmc_client_irq[0].bitmask = GPMC_IRQ_FIFOEVENTENABLE;
        gpmc_client_irq[1].bitmask = GPMC_IRQ_COUNT_EVENT;