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

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

UBI: make it possible to use struct ubi_device in debug.h 



Current layout does not allow us to add inline functions to debug.h which use
the 'struct ubi_device' object, because it is undefined there. Move
'#include "debug.h"' in "ubi.h" down so to make 'struct ubi_device" be defined.
Additionally, this makes it possible to remove a bunch of forward declarations
in "debug.h". This is a preparation to the next patch.

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

drivers/mtd/ubi/debug.h

+0 −8
Original line number Diff line number Diff line
@@ -21,14 +21,6 @@ 
#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>

drivers/mtd/ubi/ubi.h

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 


#include "ubi-media.h"

#include "scan.h"

#include "debug.h"



/* Maximum number of supported UBI devices */

#define UBI_MAX_DEVICES 32
@@ -478,6 +477,8 @@ struct ubi_device { 
	struct ubi_debug_info *dbg;

};



#include "debug.h"



extern struct kmem_cache *ubi_wl_entry_slab;

extern const struct file_operations ubi_ctrl_cdev_operations;

extern const struct file_operations ubi_cdev_operations;