Merge branch 'old_next' into next

diff --combined drivers/dma/ppc4xx/adma.c
index 3b0247e74cc4871cb703938ef82f3146011d077f,a2b62e93a14366b080549c6a25bd8d1e8ab40d53..fc457a7e8832dc8f29ed4055cc781369de4ef7aa
--- 1/drivers/dma/ppc4xx/adma.c
--- 2/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@@ -2313,7 -2313,7 +2313,7 @@@ static struct dma_async_tx_descriptor *
        if (unlikely(!len))
                return NULL;
  
-       BUG_ON(unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT));
+       BUG_ON(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT);
  
        spin_lock_bh(&ppc440spe_chan->lock);
  
@@@ -2354,7 -2354,7 +2354,7 @@@ static struct dma_async_tx_descriptor *
        if (unlikely(!len))
                return NULL;
  
-       BUG_ON(unlikely(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT));
+       BUG_ON(len > PPC440SPE_ADMA_DMA_MAX_BYTE_COUNT);
  
        spin_lock_bh(&ppc440spe_chan->lock);
  
@@@ -2397,7 -2397,7 +2397,7 @@@ static struct dma_async_tx_descriptor *
                                     dma_dest, dma_src, src_cnt));
        if (unlikely(!len))
                return NULL;
-       BUG_ON(unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT));
+       BUG_ON(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT);
  
        dev_dbg(ppc440spe_chan->device->common.dev,
                "ppc440spe adma%d: %s src_cnt: %d len: %u int_en: %d\n",
@@@ -2887,7 -2887,7 +2887,7 @@@ static struct dma_async_tx_descriptor *
        ADMA_LL_DBG(prep_dma_pq_dbg(ppc440spe_chan->device->id,
                                    dst, src, src_cnt));
        BUG_ON(!len);
-       BUG_ON(unlikely(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT));
+       BUG_ON(len > PPC440SPE_ADMA_XOR_MAX_BYTE_COUNT);
        BUG_ON(!src_cnt);
  
        if (src_cnt == 1 && dst[1] == src[0]) {
@@@ -4393,7 -4393,8 +4393,7 @@@ static void ppc440spe_adma_release_irqs
  /**
   * ppc440spe_adma_probe - probe the asynch device
   */
 -static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev,
 -                                        const struct of_device_id *match)
 +static int __devinit ppc440spe_adma_probe(struct platform_device *ofdev)
  {
        struct device_node *np = ofdev->dev.of_node;
        struct resource res;
@@@ -4943,7 -4944,7 +4943,7 @@@ static const struct of_device_id ppc440
  };
  MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match);
  
 -static struct of_platform_driver ppc440spe_adma_driver = {
 +static struct platform_driver ppc440spe_adma_driver = {
        .probe = ppc440spe_adma_probe,
        .remove = __devexit_p(ppc440spe_adma_remove),
        .driver = {
@@@ -4961,7 -4962,7 +4961,7 @@@ static __init int ppc440spe_adma_init(v
        if (ret)
                return ret;
  
 -      ret = of_register_platform_driver(&ppc440spe_adma_driver);
 +      ret = platform_driver_register(&ppc440spe_adma_driver);
        if (ret) {
                pr_err("%s: failed to register platform driver\n",
                        __func__);
@@@ -4995,7 -4996,7 +4995,7 @@@ out_dev
        /* User will not be able to enable h/w RAID-6 */
        pr_err("%s: failed to create RAID-6 driver interface\n",
                __func__);
 -      of_unregister_platform_driver(&ppc440spe_adma_driver);
 +      platform_driver_unregister(&ppc440spe_adma_driver);
  out_reg:
        dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len);
        kfree(ppc440spe_dma_fifo_buf);
@@@ -5010,7 -5011,7 +5010,7 @@@ static void __exit ppc440spe_adma_exit(
                           &driver_attr_enable);
        driver_remove_file(&ppc440spe_adma_driver.driver,
                           &driver_attr_devices);
 -      of_unregister_platform_driver(&ppc440spe_adma_driver);
 +      platform_driver_unregister(&ppc440spe_adma_driver);
        dcr_unmap(ppc440spe_mq_dcr_host, ppc440spe_mq_dcr_len);
        kfree(ppc440spe_dma_fifo_buf);
  }