Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx (8715d941) · Commits · 戴 / test

drivers/net/wireless/wl1251/Makefile

+2 −0

+0 −2

Original line number	Diff line number	Diff line
		@@ -464,8 +464,6 @@ static int wl1251_boot_upload_nvs(struct wl1251 *wl)
		val = (nvs_ptr[0] \| (nvs_ptr[1] << 8)
		\| (nvs_ptr[2] << 16) \| (nvs_ptr[3] << 24));

		val = cpu_to_le32(val);

		wl1251_debug(DEBUG_BOOT,
		"nvs write table 0x%x: 0x%x",
		nvs_start, val);

+4 −5

Original line number	Diff line number	Diff line
		@@ -36,16 +36,15 @@

		static inline u32 wl1251_read32(struct wl1251 *wl, int addr)
		{
		u32 response;

		wl->if_ops->read(wl, addr, &response, sizeof(u32));
		wl->if_ops->read(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));

		return response;
		return le32_to_cpu(wl->buffer_32);
		}

		static inline void wl1251_write32(struct wl1251 *wl, int addr, u32 val)
		{
		wl->if_ops->write(wl, addr, &val, sizeof(u32));
		wl->buffer_32 = cpu_to_le32(val);
		wl->if_ops->write(wl, addr, &wl->buffer_32, sizeof(wl->buffer_32));
		}

		static inline u32 wl1251_read_elp(struct wl1251 *wl, int addr)

+1 −1

Original line number	Diff line number	Diff line
		@@ -380,7 +380,7 @@ struct wl1251 {
		struct wl1251_stats stats;
		struct wl1251_debugfs debugfs;

		u32 buffer_32;
		__le32 buffer_32;
		u32 buffer_cmd;
		u8 buffer_busyword[WL1251_BUSY_WORD_LEN];
		struct wl1251_rx_descriptor *rx_descriptor;

+2 −0

Original line number	Diff line number	Diff line
		@@ -11,3 +11,5 @@ obj-$(CONFIG_WL12XX_SDIO) += wl12xx_sdio.o

		# small builtin driver bit
		obj-$(CONFIG_WL12XX_PLATFORM_DATA) += wl12xx_platform_data.o

		ccflags-y += -D__CHECK_ENDIAN__