aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/gianfar.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-02-22 23:05:51 -0500
committerGrant Likely <grant.likely@secretlab.ca>2011-02-28 15:22:44 -0500
commit74888760d40b3ac9054f9c5fa07b566c0676ba2d (patch)
treeede65e8b5ad746ce6c04cbe77ceb5bbf6a6dc6fd /drivers/net/gianfar.c
parentf07eb223a081b278be02a58394cb5fd66f1a1bbd (diff)
dt/net: Eliminate users of of_platform_{,un}register_driver
Get rid of users of of_platform_driver in drivers/net. The of_platform_{,un}register_driver functions are going away, so the users need to be converted to using the platform_bus_type directly. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/net/gianfar.c')
-rw-r--r--drivers/net/gianfar.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 5ed8f9f9419f..ccb231c4d933 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -123,8 +123,7 @@ static irqreturn_t gfar_interrupt(int irq, void *dev_id);
123static void adjust_link(struct net_device *dev); 123static void adjust_link(struct net_device *dev);
124static void init_registers(struct net_device *dev); 124static void init_registers(struct net_device *dev);
125static int init_phy(struct net_device *dev); 125static int init_phy(struct net_device *dev);
126static int gfar_probe(struct platform_device *ofdev, 126static int gfar_probe(struct platform_device *ofdev);
127 const struct of_device_id *match);
128static int gfar_remove(struct platform_device *ofdev); 127static int gfar_remove(struct platform_device *ofdev);
129static void free_skb_resources(struct gfar_private *priv); 128static void free_skb_resources(struct gfar_private *priv);
130static void gfar_set_multi(struct net_device *dev); 129static void gfar_set_multi(struct net_device *dev);
@@ -957,8 +956,7 @@ static void gfar_detect_errata(struct gfar_private *priv)
957 956
958/* Set up the ethernet device structure, private data, 957/* Set up the ethernet device structure, private data,
959 * and anything else we need before we start */ 958 * and anything else we need before we start */
960static int gfar_probe(struct platform_device *ofdev, 959static int gfar_probe(struct platform_device *ofdev)
961 const struct of_device_id *match)
962{ 960{
963 u32 tempval; 961 u32 tempval;
964 struct net_device *dev = NULL; 962 struct net_device *dev = NULL;
@@ -3256,7 +3254,7 @@ static struct of_device_id gfar_match[] =
3256MODULE_DEVICE_TABLE(of, gfar_match); 3254MODULE_DEVICE_TABLE(of, gfar_match);
3257 3255
3258/* Structure for a device driver */ 3256/* Structure for a device driver */
3259static struct of_platform_driver gfar_driver = { 3257static struct platform_driver gfar_driver = {
3260 .driver = { 3258 .driver = {
3261 .name = "fsl-gianfar", 3259 .name = "fsl-gianfar",
3262 .owner = THIS_MODULE, 3260 .owner = THIS_MODULE,
@@ -3269,12 +3267,12 @@ static struct of_platform_driver gfar_driver = {
3269 3267
3270static int __init gfar_init(void) 3268static int __init gfar_init(void)
3271{ 3269{
3272 return of_register_platform_driver(&gfar_driver); 3270 return platform_driver_register(&gfar_driver);
3273} 3271}
3274 3272
3275static void __exit gfar_exit(void) 3273static void __exit gfar_exit(void)
3276{ 3274{
3277 of_unregister_platform_driver(&gfar_driver); 3275 platform_driver_unregister(&gfar_driver);
3278} 3276}
3279 3277
3280module_init(gfar_init); 3278module_init(gfar_init);