[ORLinux] [PATCH 1/2] openrisc: Remove obsolete __dev* uses in non-mainline drivers

[Geert Uytterhoeven]

commit 54b956b903607f8f8878754dd4352da6a54a1da2 ("Remove __dev* markings
from init.h") removed them, causing compile failures.

Signed-off-by: Geert Uytterhoeven <geert at linux-m68k.org>
---
drivers/char/scet.c | 6 +++---
drivers/gpio/jbtrivial.c | 4 ++--
drivers/usb/host/ohs900-hcd.c | 7 +++----
3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/char/scet.c b/drivers/char/scet.c
index 428b1b8ce6c1..b18ec6ce244d 100644
--- a/drivers/char/scet.c
+++ b/drivers/char/scet.c
@@ -252,7 +252,7 @@ long device_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return 0;
}

-static int __devinit scet_probe(struct platform_device *pdev)
+static int scet_probe(struct platform_device *pdev)
{

int retval = 0;
@@ -295,7 +295,7 @@ out:
return retval;
}

-static int __devexit scet_remove(struct platform_device *dev)
+static int scet_remove(struct platform_device *dev)
{
/* Nothing to do...
* 'devres' device management takes cares of freeing
@@ -317,7 +317,7 @@ MODULE_ALIAS("platform:" DEVICE_NAME);

static struct platform_driver scet_driver = {
.probe = scet_probe,
- .remove = __devexit_p(scet_remove),
+ .remove = scet_remove,
.driver = {
.name = DEVICE_NAME,
.owner = THIS_MODULE,
diff --git a/drivers/gpio/jbtrivial.c b/drivers/gpio/jbtrivial.c
index dd81d62a219d..a6d592b8e3f3 100644
--- a/drivers/gpio/jbtrivial.c
+++ b/drivers/gpio/jbtrivial.c
@@ -186,7 +186,7 @@ static void jbgpio_save_regs(struct of_mm_gpio_chip *mm_gc)
* driver data structure. It returns 0, if the driver is bound to the GPIO
* device, or a negative value if there is an error.
*/
-static int __devinit jbgpio_of_probe(struct device_node *np)
+static int jbgpio_of_probe(struct device_node *np)
{
struct jbgpio_instance *chip;
int status = 0;
@@ -251,7 +251,7 @@ static int __devinit jbgpio_of_probe(struct device_node *np)
return 0;
}

-static struct of_device_id jbgpio_of_match[] __devinitdata = {
+static struct of_device_id jbgpio_of_match[] = {
{ .compatible = "opencores,jbtrivial" },
{ /* end of list */ },
};
diff --git a/drivers/usb/host/ohs900-hcd.c b/drivers/usb/host/ohs900-hcd.c
index df8b831bdf1c..2b6992eeaead 100644
--- a/drivers/usb/host/ohs900-hcd.c
+++ b/drivers/usb/host/ohs900-hcd.c
@@ -1552,7 +1552,7 @@ static struct hc_driver ohs900h_hc_driver = {

/*-------------------------------------------------------------------------*/

-static int __devexit ohs900h_remove(struct platform_device *dev)
+static int ohs900h_remove(struct platform_device *dev)
{
struct usb_hcd *hcd = platform_get_drvdata(dev);
struct ohs900 *ohs900 = hcd_to_ohs900(hcd);
@@ -1569,7 +1569,7 @@ static int __devexit ohs900h_remove(struct platform_device *dev)
return 0;
}

-static int __devinit ohs900h_probe(struct platform_device *pdev)
+static int ohs900h_probe(struct platform_device *pdev)
{

struct usb_hcd *hcd;
@@ -1786,8 +1786,7 @@ MODULE_DEVICE_TABLE(of, ocores_ohs900_match);
MODULE_ALIAS("platform:ohs900");
struct platform_driver ohs900h_driver = {
.probe = ohs900h_probe,
- .remove = __devexit_p(ohs900h_remove),
-
+ .remove = ohs900h_remove,
.suspend = ohs900h_suspend,
.resume = ohs900h_resume,
.driver = {