Commit 923fca08 authored by Alek Du's avatar Alek Du Committed by James Toy

1. remove module support.

2. add a mask handler to irqchip.
Signed-off-by: default avatarAlek Du <alek.du@intel.com>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 5fd1d866
...@@ -191,7 +191,7 @@ config GPIO_BT8XX ...@@ -191,7 +191,7 @@ config GPIO_BT8XX
If unsure, say N. If unsure, say N.
config GPIO_LANGWELL config GPIO_LANGWELL
tristate "Intel Moorestown Platform Langwell GPIO support" bool "Intel Moorestown Platform Langwell GPIO support"
depends on PCI depends on PCI
help help
Say Y here to support Intel Moorestown platform GPIO. Say Y here to support Intel Moorestown platform GPIO.
......
...@@ -152,8 +152,13 @@ static void lnw_irq_unmask(unsigned irq) ...@@ -152,8 +152,13 @@ static void lnw_irq_unmask(unsigned irq)
writel(BIT(gpio % 32), gedr); writel(BIT(gpio % 32), gedr);
}; };
static void lnw_irq_mask(unsigned irq)
{
};
static struct irq_chip lnw_irqchip = { static struct irq_chip lnw_irqchip = {
.name = "LNW-GPIO", .name = "LNW-GPIO",
.mask = lnw_irq_mask,
.unmask = lnw_irq_unmask, .unmask = lnw_irq_unmask,
.set_type = lnw_irq_type, .set_type = lnw_irq_type,
}; };
...@@ -277,27 +282,10 @@ done: ...@@ -277,27 +282,10 @@ done:
return retval; 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 = { static struct pci_driver lnw_gpio_driver = {
.name = "langwell_gpio", .name = "langwell_gpio",
.id_table = lnw_gpio_ids, .id_table = lnw_gpio_ids,
.probe = lnw_gpio_probe, .probe = lnw_gpio_probe,
.remove = lnw_gpio_remove,
}; };
static int __init lnw_gpio_init(void) static int __init lnw_gpio_init(void)
...@@ -305,14 +293,4 @@ 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); return pci_register_driver(&lnw_gpio_driver);
} }
static void __exit lnw_gpio_exit(void) device_initcall(lnw_gpio_init);
{
pci_unregister_driver(&lnw_gpio_driver);
}
MODULE_AUTHOR("Alek Du <alek.du@intel.com>");
MODULE_DESCRIPTION("Intel Moorestown Platform Langwell chip GPIO driver");
MODULE_LICENSE("GPL v2");
module_init(lnw_gpio_init);
module_exit(lnw_gpio_exit);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment