openocd: remove NULL comparisons with checkpatch [2/2]

[openocd.git] / src / flash / nand / fileio.h

diff --git a/src/flash/nand/fileio.h b/src/flash/nand/fileio.h
index 785543111a7b995270b68e97aeb262851f7ee31a..6a094c2f2c5db948d84420cf90bc87ace08033b8 100644 (file)
--- a/src/flash/nand/fileio.h
+++ b/src/flash/nand/fileio.h
@@ -12,12 +12,11 @@
  *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef FLASH_NAND_FILEIO_H
-#define FLASH_NAND_FILEIO_H
+
+#ifndef OPENOCD_FLASH_NAND_FILEIO_H
+#define OPENOCD_FLASH_NAND_FILEIO_H
 
 #include <helper/time_support.h>
 #include <helper/fileio.h>
@@ -36,22 +35,22 @@ struct nand_fileio_state {
        const int *eccpos;
 
        bool file_opened;
-       struct fileio fileio;
+       struct fileio *fileio;
 
        struct duration bench;
 };
 
 void nand_fileio_init(struct nand_fileio_state *state);
-int nand_fileio_start(struct command_context *cmd_ctx,
+int nand_fileio_start(struct command_invocation *cmd,
                struct nand_device *nand, const char *filename, int filemode,
                struct nand_fileio_state *state);
 int nand_fileio_cleanup(struct nand_fileio_state *state);
 int nand_fileio_finish(struct nand_fileio_state *state);
 
 COMMAND_HELPER(nand_fileio_parse_args, struct nand_fileio_state *state,
-               struct nand_device **dev, enum fileio_access filemode,
-               bool need_size, bool sw_ecc);
+       struct nand_device **dev, enum fileio_access filemode,
+       bool need_size, bool sw_ecc);
 
 int nand_fileio_read(struct nand_device *nand, struct nand_fileio_state *s);
 
-#endif // FLASH_NAND_FILEIO_H
+#endif /* OPENOCD_FLASH_NAND_FILEIO_H */