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

Commit 933d5943 authored by Pavel Roskin's avatar Pavel Roskin Committed by John W. Linville
Browse files

orinoco: minor fixes for problems found by checkpatch.pl 



Eliminate spaces before tabs.  Eliminate typedefs.  Add spaces around
operators.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 16c929df

drivers/net/wireless/orinoco/airport.c

+4 −5
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match) 
	struct orinoco_private *priv;

	struct airport *card;

	unsigned long phys_addr;

	hermes_t *hw;

	struct hermes *hw;



	if (macio_resource_count(mdev) < 1 || macio_irq_count(mdev) < 1) {

		printk(KERN_ERR PFX "Wrong interrupt/addresses in OF tree\n");
@@ -228,8 +228,7 @@ MODULE_AUTHOR("Benjamin Herrenschmidt <benh@kernel.crashing.org>"); 
MODULE_DESCRIPTION("Driver for the Apple Airport wireless card.");

MODULE_LICENSE("Dual MPL/GPL");



static struct of_device_id airport_match[] =

{

static struct of_device_id airport_match[] = {

	{

	.name		= "radio",

	},

drivers/net/wireless/orinoco/cfg.c

+3 −3
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ static int orinoco_set_channel(struct wiphy *wiphy, 
	priv->channel = channel;

	if (priv->iw_mode == NL80211_IFTYPE_MONITOR) {

		/* Fast channel change - no commit if successful */

		hermes_t *hw = &priv->hw;

		struct hermes *hw = &priv->hw;

		err = hw->ops->cmd_wait(hw, HERMES_CMD_TEST |

					    HERMES_TEST_SET_CHANNEL,

					channel, NULL);

drivers/net/wireless/orinoco/fw.c

+3 −4
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ orinoco_dl_firmware(struct orinoco_private *priv, 
	/* Plug Data Area (PDA) */

	__le16 *pda;



	hermes_t *hw = &priv->hw;

	struct hermes *hw = &priv->hw;

	const struct firmware *fw_entry;

	const struct orinoco_fw_header *hdr;

	const unsigned char *first_block;
@@ -205,7 +205,7 @@ symbol_dl_image(struct orinoco_private *priv, const struct fw_info *fw, 
		const unsigned char *image, const void *end,

		int secondary)

{

	hermes_t *hw = &priv->hw;

	struct hermes *hw = &priv->hw;

	int ret = 0;

	const unsigned char *ptr;

	const unsigned char *first_block;
@@ -322,9 +322,8 @@ symbol_dl_firmware(struct orinoco_private *priv, 
			      fw_entry->data + fw_entry->size, 1);

	if (!orinoco_cached_fw_get(priv, false))

		release_firmware(fw_entry);

	if (ret) {

	if (ret)

		dev_err(dev, "Secondary firmware download failed\n");

	}



	return ret;

}

drivers/net/wireless/orinoco/hermes.c

+21 −19
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static const struct hermes_ops hermes_ops_local; 


   Callable from any context.

*/

static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0,

static int hermes_issue_cmd(struct hermes *hw, u16 cmd, u16 param0,

			    u16 param1, u16 param2)

{

	int k = CMD_BUSY_TIMEOUT;
@@ -132,7 +132,7 @@ static int hermes_issue_cmd(hermes_t *hw, u16 cmd, u16 param0, 
 */



/* For doing cmds that wipe the magic constant in SWSUPPORT0 */

static int hermes_doicmd_wait(hermes_t *hw, u16 cmd,

static int hermes_doicmd_wait(struct hermes *hw, u16 cmd,

			      u16 parm0, u16 parm1, u16 parm2,

			      struct hermes_response *resp)

{
@@ -185,7 +185,8 @@ static int hermes_doicmd_wait(hermes_t *hw, u16 cmd, 
	return err;

}



void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing)

void hermes_struct_init(struct hermes *hw, void __iomem *address,

			int reg_spacing)

{

	hw->iobase = address;

	hw->reg_spacing = reg_spacing;
@@ -195,7 +196,7 @@ void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing) 
}

EXPORT_SYMBOL(hermes_struct_init);



static int hermes_init(hermes_t *hw)

static int hermes_init(struct hermes *hw)

{

	u16 reg;

	int err = 0;
@@ -249,7 +250,7 @@ static int hermes_init(hermes_t *hw) 
 *     > 0 on error returned by the firmware

 *

 * Callable from any context, but locking is your problem. */

static int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0,

static int hermes_docmd_wait(struct hermes *hw, u16 cmd, u16 parm0,

			     struct hermes_response *resp)

{

	int err;
@@ -313,7 +314,7 @@ static int hermes_docmd_wait(hermes_t *hw, u16 cmd, u16 parm0, 
	return err;

}



static int hermes_allocate(hermes_t *hw, u16 size, u16 *fid)

static int hermes_allocate(struct hermes *hw, u16 size, u16 *fid)

{

	int err = 0;

	int k;
@@ -363,7 +364,7 @@ static int hermes_allocate(hermes_t *hw, u16 size, u16 *fid) 
 * from firmware

 *

 * Callable from any context */

static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset)

static int hermes_bap_seek(struct hermes *hw, int bap, u16 id, u16 offset)

{

	int sreg = bap ? HERMES_SELECT1 : HERMES_SELECT0;

	int oreg = bap ? HERMES_OFFSET1 : HERMES_OFFSET0;
@@ -422,7 +423,7 @@ static int hermes_bap_seek(hermes_t *hw, int bap, u16 id, u16 offset) 
 *       0 on success

 *     > 0 on error from firmware

 */

static int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len,

static int hermes_bap_pread(struct hermes *hw, int bap, void *buf, int len,

			    u16 id, u16 offset)

{

	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
@@ -450,8 +451,8 @@ static int hermes_bap_pread(hermes_t *hw, int bap, void *buf, int len, 
 *       0 on success

 *     > 0 on error from firmware

 */

static int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len,

			     u16 id, u16 offset)

static int hermes_bap_pwrite(struct hermes *hw, int bap, const void *buf,

			     int len, u16 id, u16 offset)

{

	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;

	int err = 0;
@@ -478,8 +479,8 @@ static int hermes_bap_pwrite(hermes_t *hw, int bap, const void *buf, int len, 
 * practice.

 *

 * Callable from user or bh context.  */

static int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize,

			   u16 *length, void *buf)

static int hermes_read_ltv(struct hermes *hw, int bap, u16 rid,

			   unsigned bufsize, u16 *length, void *buf)

{

	int err = 0;

	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
@@ -523,7 +524,7 @@ static int hermes_read_ltv(hermes_t *hw, int bap, u16 rid, unsigned bufsize, 
	return 0;

}



static int hermes_write_ltv(hermes_t *hw, int bap, u16 rid,

static int hermes_write_ltv(struct hermes *hw, int bap, u16 rid,

			    u16 length, const void *value)

{

	int dreg = bap ? HERMES_DATA1 : HERMES_DATA0;
@@ -553,14 +554,14 @@ static int hermes_write_ltv(hermes_t *hw, int bap, u16 rid, 
/*** Hermes AUX control ***/



static inline void

hermes_aux_setaddr(hermes_t *hw, u32 addr)

hermes_aux_setaddr(struct hermes *hw, u32 addr)

{

	hermes_write_reg(hw, HERMES_AUXPAGE, (u16) (addr >> 7));

	hermes_write_reg(hw, HERMES_AUXOFFSET, (u16) (addr & 0x7F));

}



static inline int

hermes_aux_control(hermes_t *hw, int enabled)

hermes_aux_control(struct hermes *hw, int enabled)

{

	int desired_state = enabled ? HERMES_AUX_ENABLED : HERMES_AUX_DISABLED;

	int action = enabled ? HERMES_AUX_ENABLE : HERMES_AUX_DISABLE;
@@ -594,7 +595,7 @@ hermes_aux_control(hermes_t *hw, int enabled) 
 * wl_lkm Agere fw does

 * Don't know about intersil

 */

static int hermesi_program_init(hermes_t *hw, u32 offset)

static int hermesi_program_init(struct hermes *hw, u32 offset)

{

	int err;
@@ -643,7 +644,7 @@ static int hermesi_program_init(hermes_t *hw, u32 offset) 
 * wl_lkm Agere fw does

 * Don't know about intersil

 */

static int hermesi_program_end(hermes_t *hw)

static int hermesi_program_end(struct hermes *hw)

{

	struct hermes_response resp;

	int rc = 0;
@@ -684,7 +685,8 @@ static int hermes_program_bytes(struct hermes *hw, const char *data, 
}



/* Read PDA from the adapter */

static int hermes_read_pda(hermes_t *hw, __le16 *pda, u32 pda_addr, u16 pda_len)

static int hermes_read_pda(struct hermes *hw, __le16 *pda, u32 pda_addr,

			   u16 pda_len)

{

	int ret;

	u16 pda_size;

drivers/net/wireless/orinoco/hermes.h

+20 −17
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 *

 * As a module of low level hardware access routines, there is no

 * locking. Users of this module should ensure that they serialize

 * access to the hermes_t structure, and to the hardware

 * access to the hermes structure, and to the hardware

*/



#include <linux/if_ether.h>
@@ -406,7 +406,7 @@ struct hermes_ops { 
};



/* Basic control structure */

typedef struct hermes {

struct hermes {

	void __iomem *iobase;

	int reg_spacing;

#define HERMES_16BIT_REGSPACING	0
@@ -415,7 +415,7 @@ typedef struct hermes { 
	bool eeprom_pda;

	const struct hermes_ops *ops;

	void *priv;

} hermes_t;

};



/* Register access convenience macros */

#define hermes_read_reg(hw, off) \
@@ -427,28 +427,29 @@ typedef struct hermes { 
	hermes_write_reg((hw), HERMES_##name, (val))



/* Function prototypes */

void hermes_struct_init(hermes_t *hw, void __iomem *address, int reg_spacing);

void hermes_struct_init(struct hermes *hw, void __iomem *address,

			int reg_spacing);



/* Inline functions */



static inline int hermes_present(hermes_t *hw)

static inline int hermes_present(struct hermes *hw)

{

	return hermes_read_regn(hw, SWSUPPORT0) == HERMES_MAGIC;

}



static inline void hermes_set_irqmask(hermes_t *hw, u16 events)

static inline void hermes_set_irqmask(struct hermes *hw, u16 events)

{

	hw->inten = events;

	hermes_write_regn(hw, INTEN, events);

}



static inline int hermes_enable_port(hermes_t *hw, int port)

static inline int hermes_enable_port(struct hermes *hw, int port)

{

	return hw->ops->cmd_wait(hw, HERMES_CMD_ENABLE | (port << 8),

				 0, NULL);

}



static inline int hermes_disable_port(hermes_t *hw, int port)

static inline int hermes_disable_port(struct hermes *hw, int port)

{

	return hw->ops->cmd_wait(hw, HERMES_CMD_DISABLE | (port << 8),

				 0, NULL);
@@ -456,7 +457,7 @@ static inline int hermes_disable_port(hermes_t *hw, int port) 


/* Initiate an INQUIRE command (tallies or scan).  The result will come as an

 * information frame in __orinoco_ev_info() */

static inline int hermes_inquire(hermes_t *hw, u16 rid)

static inline int hermes_inquire(struct hermes *hw, u16 rid)

{

	return hw->ops->cmd_wait(hw, HERMES_CMD_INQUIRE, rid, NULL);

}
@@ -498,7 +499,8 @@ static inline void hermes_clear_words(struct hermes *hw, int off, 
	(hw->ops->write_ltv((hw), (bap), (rid), \

			    HERMES_BYTES_TO_RECLEN(sizeof(*buf)), (buf)))



static inline int hermes_read_wordrec(hermes_t *hw, int bap, u16 rid, u16 *word)

static inline int hermes_read_wordrec(struct hermes *hw, int bap, u16 rid,

				      u16 *word)

{

	__le16 rec;

	int err;
@@ -508,7 +510,8 @@ static inline int hermes_read_wordrec(hermes_t *hw, int bap, u16 rid, u16 *word) 
	return err;

}



static inline int hermes_write_wordrec(hermes_t *hw, int bap, u16 rid, u16 word)

static inline int hermes_write_wordrec(struct hermes *hw, int bap, u16 rid,

				       u16 word)

{

	__le16 rec = cpu_to_le16(word);

	return HERMES_WRITE_RECORD(hw, bap, rid, &rec);