The patch titled
gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix
has been removed from the -mm tree. Its filename was
gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix.patch
This patch was dropped because it was folded into gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver.patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix
From: Alek Du <alek.du@xxxxxxxxx>
1. remove module support.
2. add a mask handler to irqchip.
Signed-off-by: Alek Du <alek.du@xxxxxxxxx>
Cc: David Brownell <david-b@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpio/Kconfig | 2 -
drivers/gpio/langwell_gpio.c | 34 +++++----------------------------
2 files changed, 7 insertions(+), 29 deletions(-)
diff -puN drivers/gpio/Kconfig~gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix drivers/gpio/Kconfig
--- a/drivers/gpio/Kconfig~gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix
+++ a/drivers/gpio/Kconfig
@@ -191,7 +191,7 @@ config GPIO_BT8XX
If unsure, say N.
config GPIO_LANGWELL
- tristate "Intel Moorestown Platform Langwell GPIO support"
+ bool "Intel Moorestown Platform Langwell GPIO support"
depends on PCI
help
Say Y here to support Intel Moorestown platform GPIO.
diff -puN drivers/gpio/langwell_gpio.c~gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix drivers/gpio/langwell_gpio.c
--- a/drivers/gpio/langwell_gpio.c~gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix
+++ a/drivers/gpio/langwell_gpio.c
@@ -152,8 +152,13 @@ static void lnw_irq_unmask(unsigned irq)
writel(BIT(gpio % 32), gedr);
};
+static void lnw_irq_mask(unsigned irq)
+{
+};
+
static struct irq_chip lnw_irqchip = {
.name = "LNW-GPIO",
+ .mask = lnw_irq_mask,
.unmask = lnw_irq_unmask,
.set_type = lnw_irq_type,
};
@@ -277,27 +282,10 @@ done:
return retval;
}
-static void __devexit lnw_gpio_remove(struct pci_dev *pdev)
-{
- struct lnw_gpio *lnw = (struct lnw_gpio *)pci_get_drvdata(pdev);
-
- if (gpiochip_remove(&lnw->chip)) {
- dev_err(&pdev->dev, "langwell gpio driver remove error\n");
- return;
- }
- pci_disable_device(pdev);
- set_irq_chained_handler(pdev->irq, NULL);
- pci_release_regions(pdev);
- iounmap(lnw->reg_base);
- pci_set_drvdata(pdev, NULL);
- kfree(lnw);
-}
-
static struct pci_driver lnw_gpio_driver = {
.name = "langwell_gpio",
.id_table = lnw_gpio_ids,
.probe = lnw_gpio_probe,
- .remove = lnw_gpio_remove,
};
static int __init lnw_gpio_init(void)
@@ -305,14 +293,4 @@ static int __init lnw_gpio_init(void)
return pci_register_driver(&lnw_gpio_driver);
}
-static void __exit lnw_gpio_exit(void)
-{
- pci_unregister_driver(&lnw_gpio_driver);
-}
-
-MODULE_AUTHOR("Alek Du <alek.du@xxxxxxxxx>");
-MODULE_DESCRIPTION("Intel Moorestown Platform Langwell chip GPIO driver");
-MODULE_LICENSE("GPL v2");
-
-module_init(lnw_gpio_init);
-module_exit(lnw_gpio_exit);
+device_initcall(lnw_gpio_init);
_
Patches currently in -mm which might be from alek.du@xxxxxxxxx are
gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver.patch
gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix.patch
gpio-add-intel-moorestown-platform-langwell-chip-gpio-driver-fix-fix.patch
gpio-pca953x-add-support-for-max7315.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
