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
/
fsl_pq_mdio.c
diff --git
a/drivers/net/fsl_pq_mdio.c
b/drivers/net/fsl_pq_mdio.c
index 8d3a2ccbc953e39879c88ebd2d80d92211c2b792..52f4e8ad48e77c84b8bd4ed9cd52faa3f5adb419 100644
(file)
--- a/
drivers/net/fsl_pq_mdio.c
+++ b/
drivers/net/fsl_pq_mdio.c
@@
-265,8
+265,7
@@
static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
#endif
#endif
-static int fsl_pq_mdio_probe(struct platform_device *ofdev,
- const struct of_device_id *match)
+static int fsl_pq_mdio_probe(struct platform_device *ofdev)
{
struct device_node *np = ofdev->dev.of_node;
struct device_node *tbi;
{
struct device_node *np = ofdev->dev.of_node;
struct device_node *tbi;
@@
-471,7
+470,7
@@
static struct of_device_id fsl_pq_mdio_match[] = {
};
MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match);
};
MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match);
-static struct
of_
platform_driver fsl_pq_mdio_driver = {
+static struct platform_driver fsl_pq_mdio_driver = {
.driver = {
.name = "fsl-pq_mdio",
.owner = THIS_MODULE,
.driver = {
.name = "fsl-pq_mdio",
.owner = THIS_MODULE,
@@
-483,13
+482,13
@@
static struct of_platform_driver fsl_pq_mdio_driver = {
int __init fsl_pq_mdio_init(void)
{
int __init fsl_pq_mdio_init(void)
{
- return
of_register_platform_driv
er(&fsl_pq_mdio_driver);
+ return
platform_driver_regist
er(&fsl_pq_mdio_driver);
}
module_init(fsl_pq_mdio_init);
void fsl_pq_mdio_exit(void)
{
}
module_init(fsl_pq_mdio_init);
void fsl_pq_mdio_exit(void)
{
-
of_unregister_platform_driv
er(&fsl_pq_mdio_driver);
+
platform_driver_unregist
er(&fsl_pq_mdio_driver);
}
module_exit(fsl_pq_mdio_exit);
MODULE_LICENSE("GPL");
}
module_exit(fsl_pq_mdio_exit);
MODULE_LICENSE("GPL");
This page took
0.025059 seconds
and
5
git commands to generate.