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

Commit 35832c50 authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

orinoco: make firmware download less verbose 



The firmware download code has been in a couple of releases, without any
significant issues reported in this code.

Convert to use pr_debug, so the messages can be recoverred by defining
DEBUG.

Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent ea60a6aa

drivers/net/wireless/orinoco/hermes_dld.c

+23 −27
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ int hermes_read_pda(hermes_t *hw, 


	/* Open auxiliary port */

	ret = hermes_aux_control(hw, 1);

	printk(KERN_DEBUG PFX "AUX enable returned %d\n", ret);

	pr_debug(PFX "AUX enable returned %d\n", ret);

	if (ret)

		return ret;
@@ -319,11 +319,11 @@ int hermes_read_pda(hermes_t *hw, 


	/* Close aux port */

	ret = hermes_aux_control(hw, 0);

	printk(KERN_DEBUG PFX "AUX disable returned %d\n", ret);

	pr_debug(PFX "AUX disable returned %d\n", ret);



	/* Check PDA length */

	pda_size = le16_to_cpu(pda[0]);

	printk(KERN_DEBUG PFX "Actual PDA length %d, Max allowed %d\n",

	pr_debug(PFX "Actual PDA length %d, Max allowed %d\n",

		 pda_size, pda_len);

	if (pda_size > pda_len)

		return -EINVAL;
@@ -422,20 +422,19 @@ int hermesi_program_init(hermes_t *hw, u32 offset) 
		return err;



	err = hermes_aux_control(hw, 1);

	printk(KERN_DEBUG PFX "AUX enable returned %d\n", err);

	pr_debug(PFX "AUX enable returned %d\n", err);



	if (err)

		return err;



	printk(KERN_DEBUG PFX "Enabling volatile, EP 0x%08x\n", offset);

	pr_debug(KERN_DEBUG PFX "Enabling volatile, EP 0x%08x\n", offset);

	err = hermes_doicmd_wait(hw,

				 HERMES_PROGRAM_ENABLE_VOLATILE,

				 offset & 0xFFFFu,

				 offset >> 16,

				 0,

				 NULL);

	printk(KERN_DEBUG PFX "PROGRAM_ENABLE returned %d\n",

	       err);

	pr_debug(PFX "PROGRAM_ENABLE returned %d\n", err);



	return err;

}
@@ -454,7 +453,7 @@ int hermesi_program_end(hermes_t *hw) 


	rc = hermes_docmd_wait(hw, HERMES_PROGRAM_DISABLE, 0, &resp);



	printk(KERN_DEBUG PFX "PROGRAM_DISABLE returned %d, "

	pr_debug(PFX "PROGRAM_DISABLE returned %d, "

		 "r0 0x%04x, r1 0x%04x, r2 0x%04x\n",

		 rc, resp.resp0, resp.resp1, resp.resp2);
@@ -463,7 +462,7 @@ int hermesi_program_end(hermes_t *hw) 
		rc = -EIO;



	err = hermes_aux_control(hw, 0);

	printk(KERN_DEBUG PFX "AUX disable returned %d\n", err);

	pr_debug(PFX "AUX disable returned %d\n", err);



	/* Acknowledge any outstanding command */

	hermes_write_regn(hw, EVACK, 0xFFFF);
@@ -496,9 +495,8 @@ int hermes_program(hermes_t *hw, const char *first_block, const void *end) 


	while ((blkaddr != BLOCK_END) &&

	       (((void *) blk + blklen) <= end)) {

		printk(KERN_DEBUG PFX

		       "Programming block of length %d to address 0x%08x\n",

		       blklen, blkaddr);

		pr_debug(PFX "Programming block of length %d "

			 "to address 0x%08x\n", blklen, blkaddr);



#if !LIMIT_PROGRAM_SIZE

		/* wl_lkm driver splits this into writes of 2000 bytes */
@@ -510,8 +508,7 @@ int hermes_program(hermes_t *hw, const char *first_block, const void *end) 
		addr = blkaddr;



		while (addr < (blkaddr + blklen)) {

			printk(KERN_DEBUG PFX

			       "Programming subblock of length %d "

			pr_debug(PFX "Programming subblock of length %d "

				 "to address 0x%08x. Data @ %p\n",

				 len, addr, &blk->data[addr - blkaddr]);
@@ -643,7 +640,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw, 


		pdi = hermes_find_pdi(first_pdi, record_id, pda_end);

		if (pdi)

			printk(KERN_DEBUG PFX "Found record 0x%04x at %p\n",

			pr_debug(PFX "Found record 0x%04x at %p\n",

				 record_id, pdi);



		switch (record_id) {
@@ -654,7 +651,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw, 
			default_pdi = NULL;

			if (outdoor_pdi) {

				pdi = outdoor_pdi;

				printk(KERN_DEBUG PFX

				pr_debug(PFX

					 "Using outdoor record 0x%04x at %p\n",

					 record_id + 1, pdi);

			}
@@ -684,8 +681,7 @@ int hermes_apply_pda_with_defaults(hermes_t *hw, 
		if (!pdi && default_pdi) {

			/* Use default */

			pdi = default_pdi;

			printk(KERN_DEBUG PFX

			       "Using default record 0x%04x at %p\n",

			pr_debug(PFX "Using default record 0x%04x at %p\n",

				 record_id, pdi);

		}