Merge tag 'ovl-update-6.6' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs

[linux-2.6-microblaze.git] / drivers / base / regmap / regmap-mmio.c

diff --git a/drivers/base/regmap/regmap-mmio.c b/drivers/base/regmap/regmap-mmio.c
index 8132b5c..99d7fd8 100644 (file)
--- a/drivers/base/regmap/regmap-mmio.c
+++ b/drivers/base/regmap/regmap-mmio.c
@@ -202,15 +202,6 @@ static int regmap_mmio_noinc_write(void *context, unsigned int reg,
                                writel(swab32(valp[i]), ctx->regs + reg);
                        goto out_clk;
                }
-#ifdef CONFIG_64BIT
-               case 8:
-               {
-                       const u64 *valp = (const u64 *)val;
-                       for (i = 0; i < val_count; i++)
-                               writeq(swab64(valp[i]), ctx->regs + reg);
-                       goto out_clk;
-               }
-#endif
                default:
                        ret = -EINVAL;
                        goto out_clk;
@@ -227,11 +218,6 @@ static int regmap_mmio_noinc_write(void *context, unsigned int reg,
        case 4:
                writesl(ctx->regs + reg, (const u32 *)val, val_count);
                break;
-#ifdef CONFIG_64BIT
-       case 8:
-               writesq(ctx->regs + reg, (const u64 *)val, val_count);
-               break;
-#endif
        default:
                ret = -EINVAL;
                break;
@@ -363,11 +349,6 @@ static int regmap_mmio_noinc_read(void *context, unsigned int reg,
        case 4:
                readsl(ctx->regs + reg, (u32 *)val, val_count);
                break;
-#ifdef CONFIG_64BIT
-       case 8:
-               readsq(ctx->regs + reg, (u64 *)val, val_count);
-               break;
-#endif
        default:
                ret = -EINVAL;
                goto out_clk;
@@ -387,11 +368,6 @@ static int regmap_mmio_noinc_read(void *context, unsigned int reg,
                case 4:
                        swab32_array(val, val_count);
                        break;
-#ifdef CONFIG_64BIT
-               case 8:
-                       swab64_array(val, val_count);
-                       break;
-#endif
                default:
                        ret = -EINVAL;
                        break;