flash/stm32l4x: support STM32WBA5xx devices

[openocd.git] / src / flash / nor / sfdp.c

diff --git a/src/flash/nor/sfdp.c b/src/flash/nor/sfdp.c
index 2fbc37d1fcb80ea67300e7f3f0cb49c91828544a..5bfb54194695637efeaa0505a759ccafa1883fe7 100644 (file)
--- a/src/flash/nor/sfdp.c
+++ b/src/flash/nor/sfdp.c
@@ -1,17 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2019 by Andreas Bolsch <andreas.bolsch@mni.thm.de      *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or    *
- *   (at your option) any later version.                                                                  *
- *                                                                                                                                                *
- *   This program is distributed in the hope that it will be useful,      *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of               *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                *
- *   GNU General Public License for more details.                                                 *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License    *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -90,8 +80,8 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
        if (((header.revision >> 24) & 0xFF) != SFDP_ACCESS_PROT) {
-               LOG_ERROR("access protocol 0x%02" PRIx8 " not implemented",
-                       (header.revision >> 24) & 0xFF);
+               LOG_ERROR("access protocol 0x%02x not implemented",
+                       (header.revision >> 24) & 0xFFU);
                return ERROR_FLASH_BANK_NOT_PROBED;
        }
 
@@ -99,7 +89,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
        nph = ((header.revision >> 16) & 0xFF) + 1;
        LOG_DEBUG("parameter headers: %d", nph);
        pheaders = malloc(sizeof(struct sfdp_phdr) * nph);
-       if (pheaders == NULL) {
+       if (!pheaders) {
                LOG_ERROR("not enough memory");
                return ERROR_FAIL;
        }
@@ -119,7 +109,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
 
                /* retrieve parameter table */
                ptable = malloc(words << 2);
-               if (ptable == NULL) {
+               if (!ptable) {
                        LOG_ERROR("not enough memory");
                        retval = ERROR_FAIL;
                        goto err;