UBI: turn some macros into static inline
Similarly as we have done for UBIFS in
1dcffad741
, turn the debugging macros into static
inline functions, for the same reasons: to avoid gcc 4.5 warnings.
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
3802243a18
commit
ebfce01a6d
|
@ -21,6 +21,14 @@
|
|||
#ifndef __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
|
||||
#include <linux/random.h>
|
||||
|
||||
|
@ -45,14 +53,6 @@
|
|||
|
||||
#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_vid_hdr(const struct ubi_vid_hdr *vid_hdr);
|
||||
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_bld(fmt, ...) dbg_msg(fmt, ##__VA_ARGS__)
|
||||
|
||||
#define ubi_dbg_dump_stack() ({})
|
||||
#define ubi_dbg_dump_ec_hdr(ec_hdr) ({})
|
||||
#define ubi_dbg_dump_vid_hdr(vid_hdr) ({})
|
||||
#define ubi_dbg_dump_vol_info(vol) ({})
|
||||
#define ubi_dbg_dump_vtbl_record(r, idx) ({})
|
||||
#define ubi_dbg_dump_sv(sv) ({})
|
||||
#define ubi_dbg_dump_seb(seb, type) ({})
|
||||
#define ubi_dbg_dump_mkvol_req(req) ({})
|
||||
#define ubi_dbg_dump_flash(ubi, pnum, offset, len) ({})
|
||||
#define ubi_dbg_print_hex_dump(l, ps, pt, r, g, b, len, a) ({})
|
||||
static inline void ubi_dbg_dump_stack(void) { return; }
|
||||
static inline void
|
||||
ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr) { return; }
|
||||
static inline void
|
||||
ubi_dbg_dump_vid_hdr(const struct ubi_vid_hdr *vid_hdr) { return; }
|
||||
static inline void
|
||||
ubi_dbg_dump_vol_info(const struct ubi_volume *vol) { return; }
|
||||
static inline void
|
||||
ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx) { return; }
|
||||
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,
|
||||
int type) { return; }
|
||||
static inline void
|
||||
ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req) { return; }
|
||||
static inline void ubi_dbg_dump_flash(struct ubi_device *ubi,
|
||||
int pnum, int offset, int len) { return; }
|
||||
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; }
|
||||
|
||||
#define ubi_dbg_is_bgt_disabled() 0
|
||||
#define ubi_dbg_is_bitflip() 0
|
||||
#define ubi_dbg_is_write_failure() 0
|
||||
#define ubi_dbg_is_erase_failure() 0
|
||||
#define ubi_dbg_check_all_ff(ubi, pnum, offset, len) 0
|
||||
#define ubi_dbg_check_write(ubi, buf, pnum, offset, len) 0
|
||||
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 /* !__UBI_DEBUG_H__ */
|
||||
|
|
Loading…
Reference in New Issue