hal: fix issues reported by PVS-Studio

https://www.viva64.com/en/b/0790/#ID369075A8F4 https://www.viva64.com/en/b/0790/#IDF03E449184 Reported in #6440
espressif · Mar 14, 2022 · 12717cb · 12717cb
1 parent 6a4a6d5
commit 12717cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 30 deletions.
diff --git a/components/hal/esp32/include/hal/spi_flash_ll.h b/components/hal/esp32/include/hal/spi_flash_ll.h
@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 /*******************************************************************************
  * NOTICE
@@ -370,7 +362,7 @@ static inline void spi_flash_ll_set_usr_address(spi_dev_t *dev, uint32_t addr, i
         dev->addr = addr;
         dev->slv_wr_status = UINT32_MAX;
     } else {
-        uint32_t padding_ones = (bit_len == 32? 0 : UINT32_MAX >> bit_len);
+        uint32_t padding_ones = UINT32_MAX >> bit_len;
         dev->addr = (addr << (32 - bit_len)) | padding_ones;
     }
 }

diff --git a/components/hal/esp32/touch_sensor_hal.c b/components/hal/esp32/touch_sensor_hal.c
@@ -1,16 +1,8 @@
-// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 // The HAL layer for Touch sensor (common part)
 
@@ -46,6 +38,7 @@ void touch_hal_get_wakeup_status(touch_pad_t *pad_num)
     touch_ll_read_trigger_status_mask(&touch_mask);
     if (touch_mask == 0) {
         *pad_num = -1;
+    } else {
+        *pad_num = (touch_pad_t)(__builtin_ffs(touch_mask) - 1);
     }
-    *pad_num = (touch_pad_t)(__builtin_ffs(touch_mask) - 1);
 }
diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt
@@ -832,14 +832,12 @@ components/hal/esp32/include/hal/sha_ll.h
 components/hal/esp32/include/hal/sigmadelta_ll.h
 components/hal/esp32/include/hal/soc_ll.h
 components/hal/esp32/include/hal/spi_flash_encrypted_ll.h
-components/hal/esp32/include/hal/spi_flash_ll.h
 components/hal/esp32/include/hal/touch_sensor_hal.h
 components/hal/esp32/include/hal/touch_sensor_ll.h
 components/hal/esp32/include/hal/trace_ll.h
 components/hal/esp32/include/hal/twai_ll.h
 components/hal/esp32/include/hal/uart_ll.h
 components/hal/esp32/interrupt_descriptor_table.c
-components/hal/esp32/touch_sensor_hal.c
 components/hal/esp32c3/hmac_hal.c
 components/hal/esp32c3/include/hal/adc_hal_conf.h
 components/hal/esp32c3/include/hal/aes_ll.h