diff options
| author | Joe Perches <joe@perches.com> | 2009-11-29 19:55:45 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-29 19:55:45 -0500 |
| commit | f64f9e719261a87818dd192a3a2352e5b20fbd0f (patch) | |
| tree | b2d5cbaef3df615295f6061d8c4d6a912690556c /net/wimax | |
| parent | 152b6a62aea2d43359dd37004e9c218bf7bdeb3b (diff) | |
net: Move && and || to end of previous line
Not including net/atm/
Compiled tested x86 allyesconfig only
Added a > 80 column line or two, which I ignored.
Existing checkpatch plaints willfully, cheerfully ignored.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wimax')
| -rw-r--r-- | net/wimax/op-rfkill.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/wimax/op-rfkill.c b/net/wimax/op-rfkill.c index 94d339c345d2..ae752a64d920 100644 --- a/net/wimax/op-rfkill.c +++ b/net/wimax/op-rfkill.c | |||
| @@ -107,8 +107,8 @@ void wimax_report_rfkill_hw(struct wimax_dev *wimax_dev, | |||
| 107 | 107 | ||
| 108 | if (state != wimax_dev->rf_hw) { | 108 | if (state != wimax_dev->rf_hw) { |
| 109 | wimax_dev->rf_hw = state; | 109 | wimax_dev->rf_hw = state; |
| 110 | if (wimax_dev->rf_hw == WIMAX_RF_ON | 110 | if (wimax_dev->rf_hw == WIMAX_RF_ON && |
| 111 | && wimax_dev->rf_sw == WIMAX_RF_ON) | 111 | wimax_dev->rf_sw == WIMAX_RF_ON) |
| 112 | wimax_state = WIMAX_ST_READY; | 112 | wimax_state = WIMAX_ST_READY; |
| 113 | else | 113 | else |
| 114 | wimax_state = WIMAX_ST_RADIO_OFF; | 114 | wimax_state = WIMAX_ST_RADIO_OFF; |
| @@ -163,8 +163,8 @@ void wimax_report_rfkill_sw(struct wimax_dev *wimax_dev, | |||
| 163 | 163 | ||
| 164 | if (state != wimax_dev->rf_sw) { | 164 | if (state != wimax_dev->rf_sw) { |
| 165 | wimax_dev->rf_sw = state; | 165 | wimax_dev->rf_sw = state; |
| 166 | if (wimax_dev->rf_hw == WIMAX_RF_ON | 166 | if (wimax_dev->rf_hw == WIMAX_RF_ON && |
| 167 | && wimax_dev->rf_sw == WIMAX_RF_ON) | 167 | wimax_dev->rf_sw == WIMAX_RF_ON) |
| 168 | wimax_state = WIMAX_ST_READY; | 168 | wimax_state = WIMAX_ST_READY; |
| 169 | else | 169 | else |
| 170 | wimax_state = WIMAX_ST_RADIO_OFF; | 170 | wimax_state = WIMAX_ST_RADIO_OFF; |