projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/xen.pm.bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel...
[deliverable/linux.git]
/
drivers
/
net
/
fec_mpc52xx.c
diff --git
a/drivers/net/fec_mpc52xx.c
b/drivers/net/fec_mpc52xx.c
index 50c1213f61fe938dea1b8877d1c2dbeede6c7d2a..9f81b1ac130e4f651bff6e73c7cec441d5dfe4db 100644
(file)
--- a/
drivers/net/fec_mpc52xx.c
+++ b/
drivers/net/fec_mpc52xx.c
@@
-840,8
+840,7
@@
static const struct net_device_ops mpc52xx_fec_netdev_ops = {
/* OF Driver */
/* ======================================================================== */
/* OF Driver */
/* ======================================================================== */
-static int __devinit
-mpc52xx_fec_probe(struct platform_device *op, const struct of_device_id *match)
+static int __devinit mpc52xx_fec_probe(struct platform_device *op)
{
int rv;
struct net_device *ndev;
{
int rv;
struct net_device *ndev;
@@
-1049,7
+1048,7
@@
static struct of_device_id mpc52xx_fec_match[] = {
MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
-static struct
of_
platform_driver mpc52xx_fec_driver = {
+static struct platform_driver mpc52xx_fec_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
@@
-1073,21
+1072,21
@@
mpc52xx_fec_init(void)
{
#ifdef CONFIG_FEC_MPC52xx_MDIO
int ret;
{
#ifdef CONFIG_FEC_MPC52xx_MDIO
int ret;
- ret =
of_register_platform_driv
er(&mpc52xx_fec_mdio_driver);
+ ret =
platform_driver_regist
er(&mpc52xx_fec_mdio_driver);
if (ret) {
printk(KERN_ERR DRIVER_NAME ": failed to register mdio driver\n");
return ret;
}
#endif
if (ret) {
printk(KERN_ERR DRIVER_NAME ": failed to register mdio driver\n");
return ret;
}
#endif
- return
of_register_platform_driv
er(&mpc52xx_fec_driver);
+ return
platform_driver_regist
er(&mpc52xx_fec_driver);
}
static void __exit
mpc52xx_fec_exit(void)
{
}
static void __exit
mpc52xx_fec_exit(void)
{
-
of_unregister_platform_driv
er(&mpc52xx_fec_driver);
+
platform_driver_unregist
er(&mpc52xx_fec_driver);
#ifdef CONFIG_FEC_MPC52xx_MDIO
#ifdef CONFIG_FEC_MPC52xx_MDIO
-
of_unregister_platform_driv
er(&mpc52xx_fec_mdio_driver);
+
platform_driver_unregist
er(&mpc52xx_fec_mdio_driver);
#endif
}
#endif
}
This page took
0.033692 seconds
and
5
git commands to generate.