Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2638bc39 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ipw2200: remove white space and better format the code 



Signed-off-by: default avatarJames Ketrenos <jketreno@linux.intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7c97eb3f

drivers/net/wireless/ipw2200.c

+27 −35
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c) 
 IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \

 _ipw_write8(ipw, ofs, val)





/* 16-bit direct write (low 4K) */

#define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs))
@@ -281,7 +280,6 @@ static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c) 
 IPW_DEBUG_IO("%s %d: write_direct16(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \

 _ipw_write16(ipw, ofs, val)





/* 32-bit direct write (low 4K) */

#define _ipw_write32(ipw, ofs, val) writel((val), (ipw)->hw_base + (ofs))
@@ -290,7 +288,6 @@ static inline void ipw_write_reg32(struct ipw_priv *a, u32 b, u32 c) 
 IPW_DEBUG_IO("%s %d: write_direct32(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \

 _ipw_write32(ipw, ofs, val)





/* 8-bit direct read (low 4K) */

#define _ipw_read8(ipw, ofs) readb((ipw)->hw_base + (ofs))
@@ -304,7 +301,6 @@ static inline u8 __ipw_read8(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) 
/* alias to 8-bit direct read (low 4K of SRAM/regs), with debug wrapper */

#define ipw_read8(ipw, ofs) __ipw_read8(__FILE__, __LINE__, ipw, ofs)





/* 16-bit direct read (low 4K) */

#define _ipw_read16(ipw, ofs) readw((ipw)->hw_base + (ofs))
@@ -318,7 +314,6 @@ static inline u16 __ipw_read16(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) 
/* alias to 16-bit direct read (low 4K of SRAM/regs), with debug wrapper */

#define ipw_read16(ipw, ofs) __ipw_read16(__FILE__, __LINE__, ipw, ofs)





/* 32-bit direct read (low 4K) */

#define _ipw_read32(ipw, ofs) readl((ipw)->hw_base + (ofs))
@@ -332,7 +327,6 @@ static inline u32 __ipw_read32(char *f, u32 l, struct ipw_priv *ipw, u32 ofs) 
/* alias to 32-bit direct read (low 4K of SRAM/regs), with debug wrapper */

#define ipw_read32(ipw, ofs) __ipw_read32(__FILE__, __LINE__, ipw, ofs)





/* multi-byte read (above 4K), with debug wrapper */

static void _ipw_read_indirect(struct ipw_priv *, u32, u8 *, int);

static inline void __ipw_read_indirect(const char *f, int l,
@@ -383,7 +377,6 @@ static void _ipw_write_reg16(struct ipw_priv *priv, u32 reg, u16 value) 
	_ipw_write16(priv, IPW_INDIRECT_DATA + dif_len, value);

}





/* 8-bit indirect read (above 4K) */

static u8 _ipw_read_reg8(struct ipw_priv *priv, u32 reg)

{
@@ -1964,7 +1957,6 @@ static int __ipw_send_cmd(struct ipw_priv *priv, struct host_cmd *cmd) 
#endif

		printk_buf(IPW_DL_HOST_COMMAND, (u8 *) cmd->param, cmd->len);





	rc = ipw_queue_tx_hcmd(priv, cmd->cmd, cmd->param, cmd->len, 0);

	if (rc) {

		priv->status &= ~STATUS_HCMD_ACTIVE;
@@ -2072,8 +2064,7 @@ static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac) 
	IPW_DEBUG_INFO("%s: Setting MAC to " MAC_FMT "\n",

		       priv->net_dev->name, MAC_ARG(mac));



	return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN,

					mac);

	return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);

}



/*
@@ -2226,8 +2217,7 @@ static int ipw_send_tx_power(struct ipw_priv *priv, struct ipw_tx_power *power) 
		return -1;

	}



	return ipw_send_cmd_pdu(priv, IPW_CMD_TX_POWER, sizeof(*power),

					power);

	return ipw_send_cmd_pdu(priv, IPW_CMD_TX_POWER, sizeof(*power), power);

}



static int ipw_set_tx_power(struct ipw_priv *priv)
@@ -3356,7 +3346,6 @@ static int ipw_load(struct ipw_priv *priv) 
		IPW_ERROR("Unable to load firmware: %d\n", rc);

		goto error;

	}



#ifdef CONFIG_PM

	fw_loaded = 1;

#endif
@@ -5291,7 +5280,8 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
				"because of age: %ums.\n",

				escape_essid(network->ssid, network->ssid_len),

				MAC_ARG(network->bssid),

				jiffies_to_msecs(jiffies - network->last_scanned));

				jiffies_to_msecs(jiffies -

						 network->last_scanned));

		return 0;

	}
@@ -5502,7 +5492,8 @@ static int ipw_best_network(struct ipw_priv *priv, 
				"assoc attempt).\n",

				escape_essid(network->ssid, network->ssid_len),

				MAC_ARG(network->bssid),

				jiffies_to_msecs(jiffies - network->last_associate));

				jiffies_to_msecs(jiffies -

						 network->last_associate));

		return 0;

	}
@@ -5513,7 +5504,8 @@ static int ipw_best_network(struct ipw_priv *priv, 
				"because of age: %ums.\n",

				escape_essid(network->ssid, network->ssid_len),

				MAC_ARG(network->bssid),

				jiffies_to_msecs(jiffies - network->last_scanned));

				jiffies_to_msecs(jiffies -

						 network->last_scanned));

		return 0;

	}

drivers/net/wireless/ipw2200.h

+14 −15
Original line number Diff line number Diff line
@@ -1453,7 +1453,6 @@ do { if (ipw_debug_level & (level)) \ 
#define IPW_DOMAIN_0_END 0x1000

#define CLX_MEM_BAR_SIZE 0x1000





/* Dino/baseband control registers bits */



#define DINO_ENABLE_SYSTEM 0x80	/* 1 = baseband processor on, 0 = reset */