2011/7/13 Pavel Roskin <pro...@gnu.org>:
> Both ath5k_hw and ath5k_softc represent one instance of the hardware.
> This duplication is historical and is not needed anymore.
>
> Keep the name "ath5k_hw" for the merged structure and "ah" for the
> variable pointing to it. "ath5k_hw" is shorter than "ath5k_softc", more
> descriptive and more widely used.
>
> Put the combined structure to base.h where the old ath5k_hw used to be.
> Move some inline functions from ath5k.h to base.h, as they need the
> ath5k_hw definition.
>
> Remove memory allocation for struct ath5k_hw and the corresponding error
> handling. Merge iobase and ah_iobase fields.
>
> This patch should be applied after running following commands in the
> ath5k directory:
>
> sed -i '
> s/\<ath5k_softc\>/ath5k_hw/g
> s/\<sc\>/ah/g
> s/\<ah->ah\>/ah/g
> s/\<ah->ah_sc\>/ah/g
> /struct ath5k_hw \*ah = ah;/d
> s/struct ath5k_hw \*ah, struct ath5k_hw \*ah/struct ath5k_hw *ah/
> /^\tah = ah;/d
> s/(ah, ah)/(ah)/g
> /struct ath5k_hw;$/{N;s/struct ath5k_hw;\nstruct ath5k_hw;/struct ath5k_hw;/}
> s/ ah / sc /
> ' $i *.[ch]
> sed -i '/{$/{N;s/{\n$/{/}' rfkill.c
>
> Signed-off-by: Pavel Roskin <pro...@gnu.org>
> ---
>
> It's very important that both the changes made by sed and the changes in
> this patch are committed at once, so that no broken revisions are
> committed.
>
> This patch is virtually guaranteed to conflict with most patches for
> ath5k (as long as they contain "sc" somewhere), so it should be
> committed during a quiet period when no patches are pending.
>
> drivers/net/wireless/ath/ath5k/ath5k.h | 187
> --------------------------------
> drivers/net/wireless/ath/ath5k/base.c | 14 --
> drivers/net/wireless/ath/ath5k/base.h | 184 +++++++++++++++++++++++++++++++
> 3 files changed, 183 insertions(+), 202 deletions(-)
>
I believe we should keep struct ath5k_hw inside ath5k.h because it's
being used everywhere, not only on base.c. Having it inside base.h is
misleading, we'd better just kill base.h.
--
GPG ID: 0xD21DB2DB
As you read this post global entropy rises. Have Fun ;-)
Nick
_______________________________________________
ath5k-devel mailing list
ath5k-devel@lists.ath5k.org
https://lists.ath5k.org/mailman/listinfo/ath5k-devel
