Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus-1

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits)
  [media] rc: update for bitop name changes
  fs: simplify iget & friends
  fs: pull inode->i_lock up out of writeback_single_inode
  fs: rename inode_lock to inode_hash_lock
  fs: move i_wb_list out from under inode_lock
  fs: move i_sb_list out from under inode_lock
  fs: remove inode_lock from iput_final and prune_icache
  fs: Lock the inode LRU list separately
  fs: factor inode disposal
  fs: protect inode->i_state with inode->i_lock
  lib, arch: add filter argument to show_mem and fix private implementations
  SLUB: Write to per cpu data when allocating it
  slub: Fix debugobjects with lockless fastpath
  autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd()
  autofs4 - remove autofs4_lock
  autofs4 - fix d_manage() return on rcu-walk
  autofs4 - fix autofs4_expire_indirect() traversal
  autofs4 - fix dentry leak in autofs4_expire_direct()
  autofs4 - reinstate last used update on access
  vfs - check non-mountpoint dentry might block in __follow_mount_rcu()
  ...

NOTE!

This merge commit was created to fix compilation error. The block
tree was merged upstream and removed the 'elv_queue_empty()'
function which the new 'mtdswap' driver is using. So a simple
merge of the mtd tree with upstream does not compile. And the
mtd tree has already be published, so re-basing it is not an option.

To fix this unfortunate situation, I had to merge upstream into the
mtd-2.6.git tree without committing, put the fixup patch on top of
this, and then commit this. The result is that we do not have commits
which do not compile.

In other words, this merge commit "merges" 3 things: the MTD tree, the
upstream tree, and the fixup patch.

3 files changed, 19 insertions, 24 deletions

diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig
index 80b3b123dd7f..7c608c5ccf84 100644
--- a/drivers/w1/masters/Kconfig
+++ b/drivers/w1/masters/Kconfig
@@ -60,7 +60,7 @@ config W1_MASTER_GPIO
 
 config HDQ_MASTER_OMAP
         tristate "OMAP HDQ driver"
-        depends on ARCH_OMAP2430 || ARCH_OMAP3
+        depends on SOC_OMAP2430 || ARCH_OMAP3
         help
           Say Y here if you want support for the 1-wire or HDQ Interface
           on an OMAP processor.
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c
index 6b85e7fefa43..95921b77cf86 100644
--- a/drivers/w1/masters/ds1wm.c
+++ b/drivers/w1/masters/ds1wm.c
@@ -90,7 +90,7 @@ struct ds1wm_data {
         void            __iomem *map;
         int             bus_shift; /* # of shifts to calc register offsets */
         struct platform_device *pdev;
-        struct mfd_cell *cell;
+        const struct mfd_cell *cell;
         int             irq;
         int             active_high;
         int             slave_present;
@@ -216,7 +216,7 @@ static int ds1wm_find_divisor(int gclk)
 static void ds1wm_up(struct ds1wm_data *ds1wm_data)
 {
         int divisor;
-        struct ds1wm_driver_data *plat = ds1wm_data->cell->driver_data;
+        struct ds1wm_driver_data *plat = mfd_get_data(ds1wm_data->pdev);
 
         if (ds1wm_data->cell->enable)
                 ds1wm_data->cell->enable(ds1wm_data->pdev);
@@ -330,16 +330,11 @@ static int ds1wm_probe(struct platform_device *pdev)
         struct ds1wm_data *ds1wm_data;
         struct ds1wm_driver_data *plat;
         struct resource *res;
-        struct mfd_cell *cell;
         int ret;
 
         if (!pdev)
                 return -ENODEV;
 
-        cell = pdev->dev.platform_data;
-        if (!cell)
-                return -ENODEV;
-
         ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL);
         if (!ds1wm_data)
                 return -ENOMEM;
@@ -356,13 +351,13 @@ static int ds1wm_probe(struct platform_device *pdev)
                 ret = -ENOMEM;
                 goto err0;
         }
-        plat = cell->driver_data;
+        plat = mfd_get_data(pdev);
 
         /* calculate bus shift from mem resource */
         ds1wm_data->bus_shift = resource_size(res) >> 3;
 
         ds1wm_data->pdev = pdev;
-        ds1wm_data->cell = cell;
+        ds1wm_data->cell = mfd_get_cell(pdev);
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!res) {
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 3a7e9ff8a746..38e96ab90945 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -593,19 +593,17 @@ static int __devinit omap_hdq_probe(struct platform_device *pdev)
 
         /* get interface & functional clock objects */
         hdq_data->hdq_ick = clk_get(&pdev->dev, "ick");
-        hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
+        if (IS_ERR(hdq_data->hdq_ick)) {
+                dev_dbg(&pdev->dev, "Can't get HDQ ick clock object\n");
+                ret = PTR_ERR(hdq_data->hdq_ick);
+                goto err_ick;
+        }
 
-        if (IS_ERR(hdq_data->hdq_ick) || IS_ERR(hdq_data->hdq_fck)) {
-                dev_dbg(&pdev->dev, "Can't get HDQ clock objects\n");
-                if (IS_ERR(hdq_data->hdq_ick)) {
-                        ret = PTR_ERR(hdq_data->hdq_ick);
-                        goto err_clk;
-                }
-                if (IS_ERR(hdq_data->hdq_fck)) {
-                        ret = PTR_ERR(hdq_data->hdq_fck);
-                        clk_put(hdq_data->hdq_ick);
-                        goto err_clk;
-                }
+        hdq_data->hdq_fck = clk_get(&pdev->dev, "fck");
+        if (IS_ERR(hdq_data->hdq_fck)) {
+                dev_dbg(&pdev->dev, "Can't get HDQ fck clock object\n");
+                ret = PTR_ERR(hdq_data->hdq_fck);
+                goto err_fck;
         }
 
         hdq_data->hdq_usecount = 0;
@@ -665,10 +663,12 @@ err_fnclk:
         clk_disable(hdq_data->hdq_ick);
 
 err_intfclk:
-        clk_put(hdq_data->hdq_ick);
         clk_put(hdq_data->hdq_fck);
 
-err_clk:
+err_fck:
+        clk_put(hdq_data->hdq_ick);
+
+err_ick:
         iounmap(hdq_data->hdq_base);
 
 err_ioremap: