Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit c01f9c6f1d5ceffda59a983c95338be45223d155

Authored by Michael Buesch
Committed by John W. Linville
1 parent 1ea8739648
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

b43: Don't compile N-PHY code when N-PHY is disabled 

There's no need to compile the N-PHY support code, when the
N-PHY support is disabled in Kconfig.

Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

Showing 2 changed files with 42 additions and 2 deletions Side-by-side Diff

drivers/net/wireless/b43/Makefile
Diff comments   View file @ c01f9c6
1 1 b43-y += main.o
2 2 b43-y += tables.o
3   -b43-y += tables_nphy.o
  3 +b43-$(CONFIG_B43_NPHY) += tables_nphy.o
4 4 b43-y += phy.o
5   -b43-y += nphy.o
  5 +b43-$(CONFIG_B43_NPHY) += nphy.o
6 6 b43-y += sysfs.o
7 7 b43-y += xmit.o
8 8 b43-y += lo.o
drivers/net/wireless/b43/nphy.h
Diff comments   View file @ c01f9c6
... ... @@ -919,6 +919,10 @@
919 919  
920 920 struct b43_wldev;
921 921  
  922 +
  923 +#ifdef CONFIG_B43_NPHY
  924 +/* N-PHY support enabled */
  925 +
922 926 int b43_phy_initn(struct b43_wldev *dev);
923 927  
924 928 void b43_nphy_radio_turn_on(struct b43_wldev *dev);
... ... @@ -929,5 +933,41 @@
929 933 void b43_nphy_xmitpower(struct b43_wldev *dev);
930 934 void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna);
931 935  
  936 +
  937 +#else /* CONFIG_B43_NPHY */
  938 +/* N-PHY support disabled */
  939 +
  940 +
  941 +static inline
  942 +int b43_phy_initn(struct b43_wldev *dev)
  943 +{
  944 + return -EOPNOTSUPP;
  945 +}
  946 +
  947 +static inline
  948 +void b43_nphy_radio_turn_on(struct b43_wldev *dev)
  949 +{
  950 +}
  951 +static inline
  952 +void b43_nphy_radio_turn_off(struct b43_wldev *dev)
  953 +{
  954 +}
  955 +
  956 +static inline
  957 +int b43_nphy_selectchannel(struct b43_wldev *dev, u8 channel)
  958 +{
  959 + return -ENOSYS;
  960 +}
  961 +
  962 +static inline
  963 +void b43_nphy_xmitpower(struct b43_wldev *dev)
  964 +{
  965 +}
  966 +static inline
  967 +void b43_nphy_set_rxantenna(struct b43_wldev *dev, int antenna)
  968 +{
  969 +}
  970 +
  971 +#endif /* CONFIG_B43_NPHY */
932 972 #endif /* B43_NPHY_H_ */