Merge commit 'v3.3-rc1' into stable/for-linus-fixes-3.3

* commit 'v3.3-rc1': (9775 commits)
  Linux 3.3-rc1
  x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits
  qnx4: don't leak ->BitMap on late failure exits
  qnx4: reduce the insane nesting in qnx4_checkroot()
  qnx4: di_fname is an array, for crying out loud...
  KEYS: Permit key_serial() to be called with a const key pointer
  keys: fix user_defined key sparse messages
  ima: fix cred sparse warning
  uml: fix compile for x86-64
  MPILIB: Add a missing ENOMEM check
  tpm: fix (ACPI S3) suspend regression
  nvme: fix merge error due to change of 'make_request_fn' fn type
  xen: using EXPORT_SYMBOL requires including export.h
  gpio: tps65910: Use correct offset for gpio initialization
  acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec
  intel_idle: Split up and provide per CPU initialization func
  ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2
  tg3: Fix single-vector MSI-X code
  openvswitch: Fix multipart datapath dumps.
  ipv6: fix per device IP snmp counters
  ...

1 files changed, 0 insertions, 7 deletions

diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c
index 1dca31d9a8b3..536bbceaeaad 100644
--- a/drivers/mtd/lpddr/lpddr_cmds.c
+++ b/drivers/mtd/lpddr/lpddr_cmds.c
@@ -70,19 +70,12 @@ struct mtd_info *lpddr_cmdset(struct map_info *map)
         mtd->erase = lpddr_erase;
         mtd->write = lpddr_write_buffers;
         mtd->writev = lpddr_writev;
-        mtd->read_oob = NULL;
-        mtd->write_oob = NULL;
-        mtd->sync = NULL;
         mtd->lock = lpddr_lock;
         mtd->unlock = lpddr_unlock;
-        mtd->suspend = NULL;
-        mtd->resume = NULL;
         if (map_is_linear(map)) {
                 mtd->point = lpddr_point;
                 mtd->unpoint = lpddr_unpoint;
         }
-        mtd->block_isbad = NULL;
-        mtd->block_markbad = NULL;
         mtd->size = 1 << lpddr->qinfo->DevSizeShift;
         mtd->erasesize = 1 << lpddr->qinfo->UniformBlockSizeShift;
         mtd->writesize = 1 << lpddr->qinfo->BufSizeShift;