Commit f160ebcb authored by David Woodhouse's avatar David Woodhouse Committed by David Woodhouse
Browse files

rt2x00: treat firmware data as const

parent 45ef0bdb
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -511,8 +511,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);

	/*
+1 −1
Original line number Diff line number Diff line
@@ -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);
}
+2 −2
Original line number Diff line number Diff line
@@ -915,7 +915,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;

@@ -932,7 +932,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;
+3 −3
Original line number Diff line number Diff line
@@ -856,7 +856,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;

@@ -873,13 +873,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;
	int timeout;