600-0001-rt2x00-rt2800lib-move-rt2800_drv_data-declaration-in.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. From 7a69da907de668fb22a30ae218062d6f081864ea Mon Sep 17 00:00:00 2001
  2. From: Gabor Juhos <[email protected]>
  3. Date: Sat, 17 Aug 2013 19:31:41 +0200
  4. Subject: [PATCH] rt2x00: rt2800lib: move rt2800_drv_data declaration into
  5. rt2800lib.h
  6. The rt2800_drv_data structure contains driver specific
  7. information. Move the declaration into the rt2800lib.h
  8. header which is a more logical place for it. Also fix
  9. the comment style to avoid checkpatch warning.
  10. The patch contains no functional changes, it is in
  11. preparation for the next patch.
  12. Signed-off-by: Gabor Juhos <[email protected]>
  13. ---
  14. Changes since v1: ---
  15. ---
  16. drivers/net/wireless/rt2x00/rt2800.h | 13 -------------
  17. drivers/net/wireless/rt2x00/rt2800lib.h | 11 +++++++++++
  18. 2 files changed, 11 insertions(+), 13 deletions(-)
  19. --- a/drivers/net/wireless/rt2x00/rt2800.h
  20. +++ b/drivers/net/wireless/rt2x00/rt2800.h
  21. @@ -2960,17 +2960,4 @@ enum rt2800_eeprom_word {
  22. */
  23. #define BCN_TBTT_OFFSET 64
  24. -/*
  25. - * RT2800 driver data structure
  26. - */
  27. -struct rt2800_drv_data {
  28. - u8 calibration_bw20;
  29. - u8 calibration_bw40;
  30. - u8 bbp25;
  31. - u8 bbp26;
  32. - u8 txmixer_gain_24g;
  33. - u8 txmixer_gain_5g;
  34. - unsigned int tbtt_tick;
  35. -};
  36. -
  37. #endif /* RT2800_H */
  38. --- a/drivers/net/wireless/rt2x00/rt2800lib.h
  39. +++ b/drivers/net/wireless/rt2x00/rt2800lib.h
  40. @@ -20,6 +20,17 @@
  41. #ifndef RT2800LIB_H
  42. #define RT2800LIB_H
  43. +/* RT2800 driver data structure */
  44. +struct rt2800_drv_data {
  45. + u8 calibration_bw20;
  46. + u8 calibration_bw40;
  47. + u8 bbp25;
  48. + u8 bbp26;
  49. + u8 txmixer_gain_24g;
  50. + u8 txmixer_gain_5g;
  51. + unsigned int tbtt_tick;
  52. +};
  53. +
  54. struct rt2800_ops {
  55. void (*register_read)(struct rt2x00_dev *rt2x00dev,
  56. const unsigned int offset, u32 *value);