From: Pavel Machek <pma@sysgo.com>
To: ath9k-devel@lists.ath9k.org
Subject: [ath9k-devel] [PATCH] ath9k_htc: cleanup eeprom endiannes handling
Date: Fri, 26 Nov 2010 12:35:03 +0100 [thread overview]
Message-ID: <20101126113503.GA28137@pma.sysgo.com> (raw)
In-Reply-To: <20101126112737.GB11857@pma.sysgo.com>
There are already in-place byte swapping macros in Linux, use them.
Signed-off-by: Pavel Machek <pma@sysgo.com>
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 4fa4d8e..ee4e893 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -117,47 +117,25 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
sum ^= *eepdata++;
if (need_swap) {
- u32 integer;
- u16 word;
-
ath_print(common, ATH_DBG_EEPROM,
"EEPROM Endianness is not native.. Changing\n");
- word = swab16(eep->baseEepHeader.length);
- eep->baseEepHeader.length = word;
-
- word = swab16(eep->baseEepHeader.checksum);
- eep->baseEepHeader.checksum = word;
-
- word = swab16(eep->baseEepHeader.version);
- eep->baseEepHeader.version = word;
-
- word = swab16(eep->baseEepHeader.regDmn[0]);
- eep->baseEepHeader.regDmn[0] = word;
-
- word = swab16(eep->baseEepHeader.regDmn[1]);
- eep->baseEepHeader.regDmn[1] = word;
-
- word = swab16(eep->baseEepHeader.rfSilent);
- eep->baseEepHeader.rfSilent = word;
-
- word = swab16(eep->baseEepHeader.blueToothOptions);
- eep->baseEepHeader.blueToothOptions = word;
-
- word = swab16(eep->baseEepHeader.deviceCap);
- eep->baseEepHeader.deviceCap = word;
-
- integer = swab32(eep->modalHeader.antCtrlCommon);
- eep->modalHeader.antCtrlCommon = integer;
+ swab16s(&eep->baseEepHeader.length);
+ swab16s(&eep->baseEepHeader.checksum);
+ swab16s(&eep->baseEepHeader.version);
+ swab16s(&eep->baseEepHeader.regDmn[0]);
+ swab16s(&eep->baseEepHeader.regDmn[1]);
+ swab16s(&eep->baseEepHeader.rfSilent);
+ swab16s(&eep->baseEepHeader.blueToothOptions);
+ swab16s(&eep->baseEepHeader.deviceCap);
+ swab32s(&eep->modalHeader.antCtrlCommon);
for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) {
- integer = swab32(eep->modalHeader.antCtrlChain[i]);
- eep->modalHeader.antCtrlChain[i] = integer;
+ swab32s(&eep->modalHeader.antCtrlChain[i]);
}
for (i = 0; i < AR5416_EEPROM_MODAL_SPURS; i++) {
- word = swab16(eep->modalHeader.spurChans[i].spurChan);
- eep->modalHeader.spurChans[i].spurChan = word;
+ swab16s(&eep->modalHeader.spurChans[i].spurChan);
}
}
WARNING: multiple messages have this Message-ID (diff)
From: Pavel Machek <pma@sysgo.com>
To: Larry Finger <Larry.Finger@lwfinger.net>,
ath9k-devel@venema.h4ckr.net, Sujith.Manoharan@atheros.com
Cc: kernel list <linux-kernel@vger.kernel.org>,
chunkeey@googlemail.com, linux-wireless@vger.kernel.org,
rudolf.marek@sysgo.com, cko@sysgo.com, mfa@sysgo.com,
anl@sysgo.com
Subject: [PATCH] ath9k_htc: cleanup eeprom endiannes handling
Date: Fri, 26 Nov 2010 12:35:03 +0100 [thread overview]
Message-ID: <20101126113503.GA28137@pma.sysgo.com> (raw)
In-Reply-To: <20101126112737.GB11857@pma.sysgo.com>
There are already in-place byte swapping macros in Linux, use them.
Signed-off-by: Pavel Machek <pma@sysgo.com>
diff --git a/drivers/net/wireless/ath/ath9k/eeprom_4k.c b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
index 4fa4d8e..ee4e893 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom_4k.c
+++ b/drivers/net/wireless/ath/ath9k/eeprom_4k.c
@@ -117,47 +117,25 @@ static int ath9k_hw_4k_check_eeprom(struct ath_hw *ah)
sum ^= *eepdata++;
if (need_swap) {
- u32 integer;
- u16 word;
-
ath_print(common, ATH_DBG_EEPROM,
"EEPROM Endianness is not native.. Changing\n");
- word = swab16(eep->baseEepHeader.length);
- eep->baseEepHeader.length = word;
-
- word = swab16(eep->baseEepHeader.checksum);
- eep->baseEepHeader.checksum = word;
-
- word = swab16(eep->baseEepHeader.version);
- eep->baseEepHeader.version = word;
-
- word = swab16(eep->baseEepHeader.regDmn[0]);
- eep->baseEepHeader.regDmn[0] = word;
-
- word = swab16(eep->baseEepHeader.regDmn[1]);
- eep->baseEepHeader.regDmn[1] = word;
-
- word = swab16(eep->baseEepHeader.rfSilent);
- eep->baseEepHeader.rfSilent = word;
-
- word = swab16(eep->baseEepHeader.blueToothOptions);
- eep->baseEepHeader.blueToothOptions = word;
-
- word = swab16(eep->baseEepHeader.deviceCap);
- eep->baseEepHeader.deviceCap = word;
-
- integer = swab32(eep->modalHeader.antCtrlCommon);
- eep->modalHeader.antCtrlCommon = integer;
+ swab16s(&eep->baseEepHeader.length);
+ swab16s(&eep->baseEepHeader.checksum);
+ swab16s(&eep->baseEepHeader.version);
+ swab16s(&eep->baseEepHeader.regDmn[0]);
+ swab16s(&eep->baseEepHeader.regDmn[1]);
+ swab16s(&eep->baseEepHeader.rfSilent);
+ swab16s(&eep->baseEepHeader.blueToothOptions);
+ swab16s(&eep->baseEepHeader.deviceCap);
+ swab32s(&eep->modalHeader.antCtrlCommon);
for (i = 0; i < AR5416_EEP4K_MAX_CHAINS; i++) {
- integer = swab32(eep->modalHeader.antCtrlChain[i]);
- eep->modalHeader.antCtrlChain[i] = integer;
+ swab32s(&eep->modalHeader.antCtrlChain[i]);
}
for (i = 0; i < AR5416_EEPROM_MODAL_SPURS; i++) {
- word = swab16(eep->modalHeader.spurChans[i].spurChan);
- eep->modalHeader.spurChans[i].spurChan = word;
+ swab16s(&eep->modalHeader.spurChans[i].spurChan);
}
}
next prev parent reply other threads:[~2010-11-26 11:35 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-03 9:24 working usb wifi card, that is still possible to buy Pavel Machek
2010-11-05 9:26 ` Josh Lehan
2010-11-05 13:15 ` Larry Finger
2010-11-05 17:54 ` Johannes Berg
2010-11-05 20:12 ` Larry Finger
2010-11-06 10:43 ` Christian Lamparter
2010-11-08 7:19 ` Pavel Machek
2010-11-24 8:16 ` Pavel Machek
2010-11-24 8:42 ` Johannes Berg
2010-11-24 9:57 ` Pavel Machek
2010-11-24 13:13 ` Pavel Machek
2010-11-24 15:48 ` Larry Finger
2010-11-26 8:31 ` [ath9k-devel] ath9k_htc vs. powerpc (was Re: working usb wifi card, that is still possible to buy) Pavel Machek
2010-11-26 8:31 ` Pavel Machek
2010-11-26 10:20 ` [ath9k-devel] " Pavel Machek
2010-11-26 10:20 ` Pavel Machek
2010-11-26 11:27 ` [ath9k-devel] " Pavel Machek
2010-11-26 11:27 ` Pavel Machek
2010-11-26 11:35 ` Pavel Machek [this message]
2010-11-26 11:35 ` [PATCH] ath9k_htc: cleanup eeprom endiannes handling Pavel Machek
2010-11-26 11:37 ` [ath9k-devel] [PATCH?] do structures need to be packed? [was Re: ath9k_htc vs. powerpc (was Re: working usb wifi card, that is still possible to buy)] Pavel Machek
2010-11-26 11:37 ` Pavel Machek
2010-11-26 11:47 ` [ath9k-devel] ath9k_htc vs. powerpc (was Re: working usb wifi card, that is still possible to buy) Sujith
2010-11-26 11:47 ` Sujith
2010-11-26 12:37 ` [ath9k-devel] " Pavel Machek
2010-11-26 12:37 ` Pavel Machek
2010-11-29 9:58 ` [ath9k-devel] [PATCH] fix endianity on ath9k_htc Pavel Machek
2010-11-29 9:58 ` Pavel Machek
2010-11-29 11:46 ` [ath9k-devel] " Felix Fietkau
2010-11-29 11:46 ` Felix Fietkau
2010-11-29 12:07 ` Pavel Machek
2010-11-29 12:07 ` Pavel Machek
2010-11-29 12:11 ` [ath9k-devel] [patch] remove unneeded prototype " Pavel Machek
2010-11-29 12:11 ` Pavel Machek
2010-11-29 9:59 ` [ath9k-devel] [PATCH] ath9k_htc cleanups Pavel Machek
2010-11-29 9:59 ` Pavel Machek
2010-11-29 11:34 ` [ath9k-devel] [PATCH] ath9k_htc more cleanups Pavel Machek
2010-11-29 11:34 ` Pavel Machek
2010-11-29 10:01 ` [ath9k-devel] ath9k_htc vs. powerpc (was Re: working usb wifi card, that is still possible to buy) Pavel Machek
2010-11-29 10:01 ` Pavel Machek
2010-11-29 12:37 ` [ath9k-devel] " Sujith
2010-11-29 12:37 ` Sujith
2010-11-29 12:48 ` [ath9k-devel] " Pavel Machek
2010-11-29 12:48 ` Pavel Machek
2010-11-29 12:57 ` [ath9k-devel] " Pavel Machek
2010-11-29 12:57 ` Pavel Machek
2010-11-29 13:28 ` [ath9k-devel] " Sujith
2010-11-29 13:28 ` Sujith
2010-11-29 12:16 ` [ath9k-devel] " Sujith
2010-11-29 12:16 ` Sujith
2010-12-06 8:37 ` working usb wifi card, that is still possible to buy Pavel Machek
2010-12-06 15:30 ` Larry Finger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101126113503.GA28137@pma.sysgo.com \
--to=pma@sysgo.com \
--cc=ath9k-devel@lists.ath9k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.