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

Conflicts:

	Documentation/powerpc/booting-without-of.txt
	drivers/atm/Makefile
	drivers/net/fs_enet/fs_enet-main.c
	drivers/pci/pci-acpi.c
	net/8021q/vlan.c
	net/iucv/iucv.c

10 files changed, 27 insertions, 32 deletions

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 28b6ff3eaa37..bd35bb0a1480 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -559,7 +559,7 @@ static const struct {
 static void build_wpa_mib(struct atmel_private *priv);
 static int atmel_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
 static void atmel_copy_to_card(struct net_device *dev, u16 dest,
-                               unsigned char *src, u16 len);
+                               const unsigned char *src, u16 len);
 static void atmel_copy_to_host(struct net_device *dev, unsigned char *dest,
                                u16 src, u16 len);
 static void atmel_set_gcr(struct net_device *dev, u16 mask);
@@ -3855,7 +3855,7 @@ static int reset_atmel_card(struct net_device *dev)
         if (priv->card_type == CARD_TYPE_EEPROM) {
                 /* copy in firmware if needed */
                 const struct firmware *fw_entry = NULL;
-                unsigned char *fw;
+                const unsigned char *fw;
                 int len = priv->firmware_length;
                 if (!(fw = priv->firmware)) {
                         if (priv->firmware_type == ATMEL_FW_TYPE_NONE) {
@@ -4122,7 +4122,7 @@ static void atmel_writeAR(struct net_device *dev, u16 data)
 }
 
 static void atmel_copy_to_card(struct net_device *dev, u16 dest,
-                               unsigned char *src, u16 len)
+                               const unsigned char *src, u16 len)
 {
         int i;
         atmel_writeAR(dev, dest);
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index cc70d53fadd3..04d7a251e3f0 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -122,7 +122,7 @@ static inline void if_cs_write16(struct if_cs_card *card, uint reg, u16 val)
 static inline void if_cs_write16_rep(
         struct if_cs_card *card,
         uint reg,
-        void *buf,
+        const void *buf,
         unsigned long count)
 {
         if (debug_output)
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c
index 51f664bbee9d..b54e2ea8346b 100644
--- a/drivers/net/wireless/libertas/if_sdio.c
+++ b/drivers/net/wireless/libertas/if_sdio.c
@@ -1,7 +1,7 @@
 /*
  *  linux/drivers/net/wireless/libertas/if_sdio.c
  *
- *  Copyright 2007 Pierre Ossman
+ *  Copyright 2007-2008 Pierre Ossman
  *
  * Inspired by if_cs.c, Copyright 2007 Holger Schurig
  *
@@ -266,13 +266,10 @@ static int if_sdio_card_to_host(struct if_sdio_card *card)
 
         /*
          * The transfer must be in one transaction or the firmware
-         * goes suicidal.
+         * goes suicidal. There's no way to guarantee that for all
+         * controllers, but we can at least try.
          */
-        chunk = size;
-        if ((chunk > card->func->cur_blksize) || (chunk > 512)) {
-                chunk = (chunk + card->func->cur_blksize - 1) /
-                        card->func->cur_blksize * card->func->cur_blksize;
-        }
+        chunk = sdio_align_size(card->func, size);
 
         ret = sdio_readsb(card->func, card->buffer, card->ioport, chunk);
         if (ret)
@@ -392,7 +389,7 @@ static int if_sdio_prog_helper(struct if_sdio_card *card)
         unsigned long timeout;
         u8 *chunk_buffer;
         u32 chunk_size;
-        u8 *firmware;
+        const u8 *firmware;
         size_t size;
 
         lbs_deb_enter(LBS_DEB_SDIO);
@@ -508,7 +505,7 @@ static int if_sdio_prog_real(struct if_sdio_card *card)
         unsigned long timeout;
         u8 *chunk_buffer;
         u32 chunk_size;
-        u8 *firmware;
+        const u8 *firmware;
         size_t size, req_size;
 
         lbs_deb_enter(LBS_DEB_SDIO);
@@ -696,13 +693,10 @@ static int if_sdio_host_to_card(struct lbs_private *priv,
 
         /*
          * The transfer must be in one transaction or the firmware
-         * goes suicidal.
+         * goes suicidal. There's no way to guarantee that for all
+         * controllers, but we can at least try.
          */
-        size = nb + 4;
-        if ((size > card->func->cur_blksize) || (size > 512)) {
-                size = (size + card->func->cur_blksize - 1) /
-                        card->func->cur_blksize * card->func->cur_blksize;
-        }
+        size = sdio_align_size(card->func, nb + 4);
 
         packet = kzalloc(sizeof(struct if_sdio_packet) + size,
                         GFP_ATOMIC);
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c
index a8b4abce5bfa..632c291404ab 100644
--- a/drivers/net/wireless/libertas/if_usb.c
+++ b/drivers/net/wireless/libertas/if_usb.c
@@ -310,7 +310,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
 static int if_usb_send_fw_pkt(struct if_usb_card *cardp)
 {
         struct fwdata *fwdata = cardp->ep_out_buf;
-        uint8_t *firmware = cardp->fw->data;
+        const uint8_t *firmware = cardp->fw->data;
 
         /* If we got a CRC failure on the last block, back
            up and retry it */
@@ -768,7 +768,7 @@ static int if_usb_issue_boot_command(struct if_usb_card *cardp, int ivalue)
  *         len               image length
  *  @return     0 or -1
  */
-static int check_fwfile_format(uint8_t *data, uint32_t totlen)
+static int check_fwfile_format(const uint8_t *data, uint32_t totlen)
 {
         uint32_t bincmd, exit;
         uint32_t blksize, offset, len;
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 1610a7308c1d..815c095ef797 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -376,7 +376,8 @@ static int p54u_upload_firmware_3887(struct ieee80211_hw *dev)
         const struct firmware *fw_entry = NULL;
         int err, alen;
         u8 carry = 0;
-        u8 *buf, *tmp, *data;
+        u8 *buf, *tmp;
+        const u8 *data;
         unsigned int left, remains, block_size;
         struct x2_header *hdr;
         unsigned long timeout;
@@ -523,7 +524,7 @@ static int p54u_upload_firmware_net2280(struct ieee80211_hw *dev)
         void *buf;
         __le32 reg;
         unsigned int remains, offset;
-        u8 *data;
+        const u8 *data;
 
         buf = kmalloc(512, GFP_KERNEL);
         if (!buf) {
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 9fab0df18c3c..07b03b3c7ef1 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -487,8 +487,8 @@ struct rt2x00lib_ops {
          */
         int (*probe_hw) (struct rt2x00_dev *rt2x00dev);
         char *(*get_firmware_name) (struct rt2x00_dev *rt2x00dev);
-        u16 (*get_firmware_crc) (void *data, const size_t len);
-        int (*load_firmware) (struct rt2x00_dev *rt2x00dev, void *data,
+        u16 (*get_firmware_crc) (const void *data, const size_t len);
+        int (*load_firmware) (struct rt2x00_dev *rt2x00dev, const void *data,
                               const size_t len);
 
         /*
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.h b/drivers/net/wireless/rt2x00/rt2x00pci.h
index 50c6df4f81db..80bf97c03e2d 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.h
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.h
@@ -82,7 +82,7 @@ static inline void rt2x00pci_register_write(struct rt2x00_dev *rt2x00dev,
 static inline void
 rt2x00pci_register_multiwrite(struct rt2x00_dev *rt2x00dev,
                               const unsigned long offset,
-                              void *value, const u16 length)
+                              const void *value, const u16 length)
 {
         memcpy_toio(rt2x00dev->csr.base + offset, value, length);
 }
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index 70ef7bf434ab..f7c1f92c1448 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -926,7 +926,7 @@ static char *rt61pci_get_firmware_name(struct rt2x00_dev *rt2x00dev)
         return fw_name;
 }
 
-static u16 rt61pci_get_firmware_crc(void *data, const size_t len)
+static u16 rt61pci_get_firmware_crc(const void *data, const size_t len)
 {
         u16 crc;
 
@@ -943,7 +943,7 @@ static u16 rt61pci_get_firmware_crc(void *data, const size_t len)
         return crc;
 }
 
-static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
+static int rt61pci_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data,
                                  const size_t len)
 {
         int i;
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 34c6ff27afc4..d383735ab8f2 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -867,7 +867,7 @@ static char *rt73usb_get_firmware_name(struct rt2x00_dev *rt2x00dev)
         return FIRMWARE_RT2571;
 }
 
-static u16 rt73usb_get_firmware_crc(void *data, const size_t len)
+static u16 rt73usb_get_firmware_crc(const void *data, const size_t len)
 {
         u16 crc;
 
@@ -884,13 +884,13 @@ static u16 rt73usb_get_firmware_crc(void *data, const size_t len)
         return crc;
 }
 
-static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, void *data,
+static int rt73usb_load_firmware(struct rt2x00_dev *rt2x00dev, const void *data,
                                  const size_t len)
 {
         unsigned int i;
         int status;
         u32 reg;
-        char *ptr = data;
+        const char *ptr = data;
         char *cache;
         int buflen;
 
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c
index 07e4d1f73207..b16ec6e5f0e3 100644
--- a/drivers/net/wireless/zd1201.c
+++ b/drivers/net/wireless/zd1201.c
@@ -49,7 +49,7 @@ MODULE_DEVICE_TABLE(usb, zd1201_table);
 static int zd1201_fw_upload(struct usb_device *dev, int apfw)
 {
         const struct firmware *fw_entry;
-        char *data;
+        const char *data;
         unsigned long len;
         int err;
         unsigned char ret;