Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 18073733247dc0c31e07f3a87f3267fe8d7e7022

Authored by Artem Bityutskiy
1 parent 27a0f2a37a
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

Showing 2 changed files with 2 additions and 9 deletions Side-by-side Diff

drivers/mtd/ubi/debug.h
Diff comments   View file @ 1807373
... ... @@ -21,14 +21,6 @@
21 21 #ifndef __UBI_DEBUG_H__
22 22 #define __UBI_DEBUG_H__
23 23  
24   -struct ubi_ec_hdr;
25   -struct ubi_vid_hdr;
26   -struct ubi_volume;
27   -struct ubi_vtbl_record;
28   -struct ubi_scan_volume;
29   -struct ubi_scan_leb;
30   -struct ubi_mkvol_req;
31   -
32 24 #ifdef CONFIG_MTD_UBI_DEBUG
33 25 #include <linux/random.h>
34 26  
drivers/mtd/ubi/ubi.h
Diff comments   View file @ 1807373
... ... @@ -44,7 +44,6 @@
44 44  
45 45 #include "ubi-media.h"
46 46 #include "scan.h"
47   -#include "debug.h"
48 47  
49 48 /* Maximum number of supported UBI devices */
50 49 #define UBI_MAX_DEVICES 32
... ... @@ -477,6 +476,8 @@
477 476  
478 477 struct ubi_debug_info *dbg;
479 478 };
  479 +
  480 +#include "debug.h"
480 481  
481 482 extern struct kmem_cache *ubi_wl_entry_slab;
482 483 extern const struct file_operations ubi_ctrl_cdev_operations;