Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebfce01a authored by Artem Bityutskiy's avatar Artem Bityutskiy
Browse files

UBI: turn some macros into static inline 



Similarly as we have done for UBIFS in
1dcffad7, turn the debugging macros into static
inline functions, for the same reasons: to avoid gcc 4.5 warnings.

Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 3802243a

drivers/mtd/ubi/debug.h

+38 −25
Original line number Original line Diff line number Diff line
@@ -21,6 +21,14 @@ 
#ifndef __UBI_DEBUG_H__

#ifndef __UBI_DEBUG_H__

#define __UBI_DEBUG_H__

#define __UBI_DEBUG_H__





struct ubi_ec_hdr;

struct ubi_vid_hdr;

struct ubi_volume;

struct ubi_vtbl_record;

struct ubi_scan_volume;

struct ubi_scan_leb;

struct ubi_mkvol_req;



#ifdef CONFIG_MTD_UBI_DEBUG

#ifdef CONFIG_MTD_UBI_DEBUG

#include <linux/random.h>

#include <linux/random.h>
@@ -45,14 +53,6 @@ 




#define ubi_dbg_dump_stack() dump_stack()

#define ubi_dbg_dump_stack() dump_stack()





struct ubi_ec_hdr;

struct ubi_vid_hdr;

struct ubi_volume;

struct ubi_vtbl_record;

struct ubi_scan_volume;

struct ubi_scan_leb;

struct ubi_mkvol_req;



void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr);

void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr);

void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);

void ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr);

void ubi_dbg_dump_vol_info(const struct ubi_volume *vol);

void ubi_dbg_dump_vol_info(const struct ubi_volume *vol);
@@ -209,23 +209,36 @@ static inline int ubi_dbg_is_erase_failure(void) 
#define dbg_io(fmt, ...)   dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_io(fmt, ...)   dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_bld(fmt, ...)  dbg_msg(fmt, ##__VA_ARGS__)

#define dbg_bld(fmt, ...)  dbg_msg(fmt, ##__VA_ARGS__)





#define ubi_dbg_dump_stack()             ({})

static inline void ubi_dbg_dump_stack(void)                          { return; }

#define ubi_dbg_dump_ec_hdr(ec_hdr)      ({})

static inline void

#define ubi_dbg_dump_vid_hdr(vid_hdr)    ({})

ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)                 { return; }

#define ubi_dbg_dump_vol_info(vol)       ({})

static inline void

#define ubi_dbg_dump_vtbl_record(r, idx) ({})

ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr)              { return; }

#define ubi_dbg_dump_sv(sv)              ({})

static inline void

#define ubi_dbg_dump_seb(seb, type)      ({})

ubi_dbg_dump_vol_info(const struct ubi_volume *vol)                  { return; }

#define ubi_dbg_dump_mkvol_req(req)      ({})

static inline void

#define ubi_dbg_dump_flash(ubi, pnum, offset, len) ({})

ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)   { return; }

#define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a)  ({})

static inline void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv) { return; }



static inline void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb,

#define ubi_dbg_is_bgt_disabled()  0

				    int type)                        { return; }

#define ubi_dbg_is_bitflip()       0

static inline void

#define ubi_dbg_is_write_failure() 0

ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req)              { return; }

#define ubi_dbg_is_erase_failure() 0

static inline void ubi_dbg_dump_flash(struct ubi_device *ubi,

#define ubi_dbg_check_all_ff(ubi, pnum, offset, len) 0

				      int pnum, int offset, int len) { return; }

#define ubi_dbg_check_write(ubi, buf, pnum, offset, len) 0

static inline void

ubi_dbg_print_hex_dump(const char *l, const char *ps, int pt, int r,

		       int g, const void *b, size_t len, bool a)     { return; }



static inline int ubi_dbg_is_bgt_disabled(void)                    { return 0; }

static inline int ubi_dbg_is_bitflip(void)                         { return 0; }

static inline int ubi_dbg_is_write_failure(void)                   { return 0; }

static inline int ubi_dbg_is_erase_failure(void)                   { return 0; }

static inline int ubi_dbg_check_all_ff(struct ubi_device *ubi,

				       int pnum, int offset,

				       int len)                    { return 0; }

static inline int ubi_dbg_check_write(struct ubi_device *ubi,

				      const void *buf, int pnum,

				      int offset, int len)         { return 0; }





#endif /* !CONFIG_MTD_UBI_DEBUG */

#endif /* !CONFIG_MTD_UBI_DEBUG */

#endif /* !__UBI_DEBUG_H__ */
 
#endif /* !__UBI_DEBUG_H__ */