Merge commit '4cb38750d49010ae72e718d46605ac9ba5a851b4' into stable/for-linus-3.6

* commit '4cb38750d49010ae72e718d46605ac9ba5a851b4': (6849 commits)
  bcma: fix invalid PMU chip control masks
  [libata] pata_cmd64x: whitespace cleanup
  libata-acpi: fix up for acpi_pm_device_sleep_state API
  sata_dwc_460ex: device tree may specify dma_channel
  ahci, trivial: fixed coding style issues related to braces
  ahci_platform: add hibernation callbacks
  libata-eh.c: local functions should not be exposed globally
  libata-transport.c: local functions should not be exposed globally
  sata_dwc_460ex: support hardreset
  ata: use module_pci_driver
  drivers/ata/pata_pcmcia.c: adjust suspicious bit operation
  pata_imx: Convert to clk_prepare_enable/clk_disable_unprepare
  ahci: Enable SB600 64bit DMA on MSI K9AGM2 (MS-7327) v2
  [libata] Prevent interface errors with Seagate FreeAgent GoFlex
  drivers/acpi/glue: revert accidental license-related 6b66d95895c bits
  libata-acpi: add missing inlines in libata.h
  i2c-omap: Add support for I2C_M_STOP message flag
  i2c: Fall back to emulated SMBus if the operation isn't supported natively
  i2c: Add SCCB support
  i2c-tiny-usb: Add support for the Robofuzz OSIF USB/I2C converter
  ...

1 files changed, 0 insertions, 88 deletions

diff --git a/lib/mpi/mpiutil.c b/lib/mpi/mpiutil.c
index 26e4ed31e256..657979f71bef 100644
--- a/lib/mpi/mpiutil.c
+++ b/lib/mpi/mpiutil.c
@@ -106,13 +106,6 @@ int mpi_resize(MPI a, unsigned nlimbs)
         return 0;
 }
 
-void mpi_clear(MPI a)
-{
-        a->nlimbs = 0;
-        a->nbits = 0;
-        a->flags = 0;
-}
-
 void mpi_free(MPI a)
 {
         if (!a)
@@ -128,84 +121,3 @@ void mpi_free(MPI a)
         kfree(a);
 }
 EXPORT_SYMBOL_GPL(mpi_free);
-
-/****************
- * Note: This copy function should not interpret the MPI
- *       but copy it transparently.
- */
-int mpi_copy(MPI *copied, const MPI a)
-{
-        size_t i;
-        MPI b;
-
-        *copied = NULL;
-
-        if (a) {
-                b = mpi_alloc(a->nlimbs);
-                if (!b)
-                        return -ENOMEM;
-
-                b->nlimbs = a->nlimbs;
-                b->sign = a->sign;
-                b->flags = a->flags;
-                b->nbits = a->nbits;
-
-                for (i = 0; i < b->nlimbs; i++)
-                        b->d[i] = a->d[i];
-
-                *copied = b;
-        }
-
-        return 0;
-}
-
-int mpi_set(MPI w, const MPI u)
-{
-        mpi_ptr_t wp, up;
-        mpi_size_t usize = u->nlimbs;
-        int usign = u->sign;
-
-        if (RESIZE_IF_NEEDED(w, (size_t) usize) < 0)
-                return -ENOMEM;
-
-        wp = w->d;
-        up = u->d;
-        MPN_COPY(wp, up, usize);
-        w->nlimbs = usize;
-        w->nbits = u->nbits;
-        w->flags = u->flags;
-        w->sign = usign;
-        return 0;
-}
-
-int mpi_set_ui(MPI w, unsigned long u)
-{
-        if (RESIZE_IF_NEEDED(w, 1) < 0)
-                return -ENOMEM;
-        w->d[0] = u;
-        w->nlimbs = u ? 1 : 0;
-        w->sign = 0;
-        w->nbits = 0;
-        w->flags = 0;
-        return 0;
-}
-
-MPI mpi_alloc_set_ui(unsigned long u)
-{
-        MPI w = mpi_alloc(1);
-        if (!w)
-                return w;
-        w->d[0] = u;
-        w->nlimbs = u ? 1 : 0;
-        w->sign = 0;
-        return w;
-}
-
-void mpi_swap(MPI a, MPI b)
-{
-        struct gcry_mpi tmp;
-
-        tmp = *a;
-        *a = *b;
-        *b = tmp;
-}