summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/85xx
diff options
context:
space:
mode:
authorBen Collins <benmcollins13@gmail.com>2013-03-18 19:19:07 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-18 18:49:10 -0700
commit9997d08806062cb7ba471ab12fa2742cfec2f413 (patch)
tree6b7878f7b5147a6227d6188b7159d0944a1e8b04 /arch/powerpc/platforms/85xx
parentb63dc123b20e54a306ff1bfa191e511c506ee331 (diff)
downloadblackbird-op-linux-9997d08806062cb7ba471ab12fa2742cfec2f413.tar.gz
blackbird-op-linux-9997d08806062cb7ba471ab12fa2742cfec2f413.zip
sgy-cts1000: Remove __dev* attributes
Somehow the driver snuck in with these still in it. Signed-off-by: Ben Collins <ben.c@servergy.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/platforms/85xx')
-rw-r--r--arch/powerpc/platforms/85xx/sgy_cts1000.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/85xx/sgy_cts1000.c b/arch/powerpc/platforms/85xx/sgy_cts1000.c
index 611e92f291c4..7179726ba5c5 100644
--- a/arch/powerpc/platforms/85xx/sgy_cts1000.c
+++ b/arch/powerpc/platforms/85xx/sgy_cts1000.c
@@ -69,7 +69,7 @@ static irqreturn_t gpio_halt_irq(int irq, void *__data)
return IRQ_HANDLED;
};
-static int __devinit gpio_halt_probe(struct platform_device *pdev)
+static int gpio_halt_probe(struct platform_device *pdev)
{
enum of_gpio_flags flags;
struct device_node *node = pdev->dev.of_node;
@@ -128,7 +128,7 @@ static int __devinit gpio_halt_probe(struct platform_device *pdev)
return 0;
}
-static int __devexit gpio_halt_remove(struct platform_device *pdev)
+static int gpio_halt_remove(struct platform_device *pdev)
{
if (halt_node) {
int gpio = of_get_gpio(halt_node, 0);
@@ -165,7 +165,7 @@ static struct platform_driver gpio_halt_driver = {
.of_match_table = gpio_halt_match,
},
.probe = gpio_halt_probe,
- .remove = __devexit_p(gpio_halt_remove),
+ .remove = gpio_halt_remove,
};
module_platform_driver(gpio_halt_driver);
OpenPOWER on IntegriCloud