projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull motherboard into release branch
[powerpc.git]
/
drivers
/
net
/
tokenring
/
proteon.c
diff --git
a/drivers/net/tokenring/proteon.c
b/drivers/net/tokenring/proteon.c
index
eb1423e
..
4f75696
100644
(file)
--- a/
drivers/net/tokenring/proteon.c
+++ b/
drivers/net/tokenring/proteon.c
@@
-29,6
+29,7
@@
static const char version[] = "proteon.c: v1.00 02/01/2003 by Jochen Friedrich\n
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/trdevice.h>
#include <linux/init.h>
#include <linux/netdevice.h>
#include <linux/trdevice.h>
+#include <linux/platform_device.h>
#include <asm/system.h>
#include <asm/io.h>
#include <asm/system.h>
#include <asm/io.h>
@@
-343,9
+344,10
@@
module_param_array(dma, int, NULL, 0);
static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];
static struct platform_device *proteon_dev[ISATR_MAX_ADAPTERS];
-static struct device_driver proteon_driver = {
- .name = "proteon",
- .bus = &platform_bus_type,
+static struct platform_driver proteon_driver = {
+ .driver = {
+ .name = "proteon",
+ },
};
static int __init proteon_init(void)
};
static int __init proteon_init(void)
@@
-354,7
+356,7
@@
static int __init proteon_init(void)
struct platform_device *pdev;
int i, num = 0, err = 0;
struct platform_device *pdev;
int i, num = 0, err = 0;
- err = driver_register(&proteon_driver);
+ err =
platform_
driver_register(&proteon_driver);
if (err)
return err;
if (err)
return err;
@@
-371,7
+373,7
@@
static int __init proteon_init(void)
err = setup_card(dev, &pdev->dev);
if (!err) {
proteon_dev[i] = pdev;
err = setup_card(dev, &pdev->dev);
if (!err) {
proteon_dev[i] = pdev;
-
dev_set_drvdata(&pdev->
dev, dev);
+
platform_set_drvdata(p
dev, dev);
++num;
} else {
platform_device_unregister(pdev);
++num;
} else {
platform_device_unregister(pdev);
@@
-398,17
+400,17
@@
static void __exit proteon_cleanup(void)
if (!pdev)
continue;
if (!pdev)
continue;
- dev =
dev_get_drvdata(&pdev->
dev);
+ dev =
platform_get_drvdata(p
dev);
unregister_netdev(dev);
release_region(dev->base_addr, PROTEON_IO_EXTENT);
free_irq(dev->irq, dev);
free_dma(dev->dma);
tmsdev_term(dev);
free_netdev(dev);
unregister_netdev(dev);
release_region(dev->base_addr, PROTEON_IO_EXTENT);
free_irq(dev->irq, dev);
free_dma(dev->dma);
tmsdev_term(dev);
free_netdev(dev);
-
dev_set_drvdata(&pdev->
dev, NULL);
+
platform_set_drvdata(p
dev, NULL);
platform_device_unregister(pdev);
}
platform_device_unregister(pdev);
}
- driver_unregister(&proteon_driver);
+
platform_
driver_unregister(&proteon_driver);
}
module_init(proteon_init);
}
module_init(proteon_init);