Re: [PATCH] ath9k : Display MAC/BB and RF version at startup

[Kalle Valo <kalle.valo@nokia.com>]

"Benoit PAPILLAULT" <benoit.papillault@free.fr> writes:

> This patch decodes the MAC/BB version (for instance: AR5416) and the RF
> part version (for instance: AR5133). It has been tested on AR5416/AR5133
> which is a 2.4/5GHz 3x3 11n device. It also makes the differences
> between AR5416 (PCI) and AR5418 (PCI Express). Both are named AR5416 in
> the register definitions.
>
> Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>

[...]

> -	printk(KERN_INFO "%s: %s: mem=0x%lx, irq=%d\n",
> +	ah = sc->sc_ah;
> +	macVersion = ah->ah_macVersion;
> +	rfVersion  = (ah->ah_analog5GhzRev & AR_RADIO_SREV_MAJOR);
> +	printk(KERN_INFO
> +	       "%s: Atheros AR%s%s%s%s%s%s MAC/BB Rev:%x "
> +	       "AR%s%s%s%s%s RF Rev:%x: mem=0x%lx, irq=%d\n",
>  	       wiphy_name(hw->wiphy),
> -	       athname ? athname : "Atheros ???",
> +	       macVersion == AR_SREV_VERSION_5416_PCI  ? "5416" : "",
> +	       macVersion == AR_SREV_VERSION_5416_PCIE ? "5418" : "",
> +	       macVersion == AR_SREV_VERSION_9100      ? "9100" : "",
> +	       macVersion == AR_SREV_VERSION_9160      ? "9160" : "",
> +	       macVersion == AR_SREV_VERSION_9280      ? "9280" : "",
> +	       macVersion == AR_SREV_VERSION_9285      ? "9285" : "",
> +	       ah->ah_macRev,
> +	       rfVersion  == 0                         ? "5133" : "",
> +	       rfVersion  == AR_RAD5133_SREV_MAJOR     ? "5133" : "",
> +	       rfVersion  == AR_RAD5122_SREV_MAJOR     ? "5122" : "",
> +	       rfVersion  == AR_RAD2133_SREV_MAJOR     ? "2133" : "",
> +	       rfVersion  == AR_RAD2122_SREV_MAJOR     ? "2122" : "",
> +	       ah->ah_phyRev,

I recommend adding a separate function returning the string instead of
this ugly "%s%s%s%s" trick. Much cleaner that way.

-- 
Kalle Valo