Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

3 files changed, 19 insertions, 13 deletions

diff --git a/drivers/net/can/mscan/Kconfig b/drivers/net/can/mscan/Kconfig
index 27d1d398e25e..d38706958af6 100644
--- a/drivers/net/can/mscan/Kconfig
+++ b/drivers/net/can/mscan/Kconfig
@@ -1,5 +1,5 @@
 config CAN_MSCAN
-        depends on CAN_DEV && (PPC || M68K || M68KNOMMU)
+        depends on CAN_DEV && (PPC || M68K)
         tristate "Support for Freescale MSCAN based chips"
         ---help---
           The Motorola Scalable Controller Area Network (MSCAN) definition
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index b1bdc909090f..5fedc3375562 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -143,12 +143,12 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
         np_clock = of_find_matching_node(NULL, mpc512x_clock_ids);
         if (!np_clock) {
                 dev_err(&ofdev->dev, "couldn't find clock node\n");
-                return -ENODEV;
+                return 0;
         }
         clockctl = of_iomap(np_clock, 0);
         if (!clockctl) {
                 dev_err(&ofdev->dev, "couldn't map clock registers\n");
-                return 0;
+                goto exit_put;
         }
 
         /* Determine the MSCAN device index from the physical address */
@@ -233,9 +233,9 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
                 clocksrc == 1 ? "ref_clk" : "sys_clk", clockdiv);
 
 exit_unmap:
-        of_node_put(np_clock);
         iounmap(clockctl);
-
+exit_put:
+        of_node_put(np_clock);
         return freq;
 }
 #else /* !CONFIG_PPC_MPC512x */
@@ -247,10 +247,11 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev,
 }
 #endif /* CONFIG_PPC_MPC512x */
 
-static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev,
-                                       const struct of_device_id *id)
+static struct of_device_id mpc5xxx_can_table[];
+static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
 {
-        struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
+        const struct of_device_id *match;
+        struct mpc5xxx_can_data *data;
         struct device_node *np = ofdev->dev.of_node;
         struct net_device *dev;
         struct mscan_priv *priv;
@@ -259,6 +260,11 @@ static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev,
         int irq, mscan_clksrc = 0;
         int err = -ENOMEM;
 
+        match = of_match_device(mpc5xxx_can_table, &ofdev->dev);
+        if (!match)
+                return -EINVAL;
+        data = match->data;
+
         base = of_iomap(np, 0);
         if (!base) {
                 dev_err(&ofdev->dev, "couldn't ioremap\n");
@@ -391,7 +397,7 @@ static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
         {},
 };
 
-static struct of_platform_driver mpc5xxx_can_driver = {
+static struct platform_driver mpc5xxx_can_driver = {
         .driver = {
                 .name = "mpc5xxx_can",
                 .owner = THIS_MODULE,
@@ -407,13 +413,13 @@ static struct of_platform_driver mpc5xxx_can_driver = {
 
 static int __init mpc5xxx_can_init(void)
 {
-        return of_register_platform_driver(&mpc5xxx_can_driver);
+        return platform_driver_register(&mpc5xxx_can_driver);
 }
 module_init(mpc5xxx_can_init);
 
 static void __exit mpc5xxx_can_exit(void)
 {
-        return of_unregister_platform_driver(&mpc5xxx_can_driver);
+        platform_driver_unregister(&mpc5xxx_can_driver);
 };
 module_exit(mpc5xxx_can_exit);
 
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 64c378cd0c34..92feac68b66e 100644
--- a/drivers/net/can/mscan/mscan.c
+++ b/drivers/net/can/mscan/mscan.c
@@ -182,7 +182,7 @@ static int mscan_restart(struct net_device *dev)
 
                 priv->can.state = CAN_STATE_ERROR_ACTIVE;
                 WARN(!(in_8(&regs->canmisc) & MSCAN_BOHOLD),
-                     "bus-off state expected");
+                     "bus-off state expected\n");
                 out_8(&regs->canmisc, MSCAN_BOHOLD);
                 /* Re-enable receive interrupts. */
                 out_8(&regs->canrier, MSCAN_RX_INTS_ENABLE);
@@ -246,7 +246,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev)
                 out_be16(&regs->tx.idr3_2, can_id);
 
                 can_id >>= 16;
-                /* EFF_FLAGS are inbetween the IDs :( */
+                /* EFF_FLAGS are between the IDs :( */
                 can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0)
                          | MSCAN_EFF_FLAGS;
         } else {