Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / hermes.c

diff --git a/drivers/net/wireless/hermes.c b/drivers/net/wireless/hermes.c
index be24f01ea469f84869cce58691aa3d9987444ede..29d39105f5b869a4a59be436e41ab2015a3c822e 100644 (file)
--- a/drivers/net/wireless/hermes.c
+++ b/drivers/net/wireless/hermes.c
@@ -38,7 +38,6 @@
  * under either the MPL or the GPL.
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
@@ -424,43 +423,6 @@ int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,
        return err;
 }
 
-/* Write a block of data to the chip's buffer with padding if
- * neccessary, via the BAP. Synchronization/serialization is the
- * caller's problem.
- *
- * Returns: < 0 on internal failure (errno), 0 on success, > 0 on error from firmware
- */
-int hermes_bap_pwrite_pad(hermes_t *hw, int bap, const void *buf, unsigned data_len, int len,
-                     u16 id, u16 offset)
-{
-       int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
-       int err = 0;
-
-       if (len < 0 || data_len > len)
-               return -EINVAL;
-
-       err = hermes_bap_seek(hw, bap, id, offset);
-       if (err)
-               goto out;
-
-       /* Transfer all the complete words of data */
-       hermes_write_bytes(hw, dreg, buf, data_len);
-       /* If there is an odd byte left over pad and transfer it */
-       if (data_len & 1) {
-               u8 end[2];
-               end[1] = 0;
-               end[0] = ((unsigned char *)buf)[data_len - 1];
-               hermes_write_bytes(hw, dreg, end, 2);
-               data_len ++;
-       }
-       /* Now send zeros for the padding */
-       if (data_len < len)
-               hermes_clear_words(hw, dreg, (len - data_len) / 2);
-       /* Complete */
- out:
-       return err;
-}
-
 /* Read a Length-Type-Value record from the card.
  *
  * If length is NULL, we ignore the length read from the card, and
@@ -548,7 +510,6 @@ EXPORT_SYMBOL(hermes_allocate);
 
 EXPORT_SYMBOL(hermes_bap_pread);
 EXPORT_SYMBOL(hermes_bap_pwrite);
-EXPORT_SYMBOL(hermes_bap_pwrite_pad);
 EXPORT_SYMBOL(hermes_read_ltv);
 EXPORT_SYMBOL(hermes_write_ltv);