Couple macro are duplicated defined and they are not used. So to tame gcc, let's remove them.
fs/hfsplus/part_tbl.c:26:0: warning: macro "HFS_DRVR_DESC_MAGIC" is not used [-Wunused-macros] fs/hfsplus/part_tbl.c:30:0: warning: macro "HFS_MFS_SUPER_MAGIC" is not used [-Wunused-macros] fs/hfsplus/part_tbl.c:21:0: warning: macro "HFS_DD_BLK" is not used [-Wunused-macros] net/l2tp/l2tp_core.c:73:0: warning: macro "L2TP_HDRFLAG_P" is not used [-Wunused-macros] Signed-off-by: Alex Shi <alex....@linux.alibaba.com> Cc: linux-fsde...@vger.kernel.org Cc: linux-kernel@vger.kernel.org --- fs/hfs/hfs.h | 2 -- fs/hfsplus/part_tbl.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/fs/hfs/hfs.h b/fs/hfs/hfs.h index 6f194d0768b6..12a807d9dbc0 100644 --- a/fs/hfs/hfs.h +++ b/fs/hfs/hfs.h @@ -15,11 +15,9 @@ #define HFS_MDB_BLK 2 /* Block (w/i partition) of MDB */ /* magic numbers for various disk blocks */ -#define HFS_DRVR_DESC_MAGIC 0x4552 /* "ER": driver descriptor map */ #define HFS_OLD_PMAP_MAGIC 0x5453 /* "TS": old-type partition map */ #define HFS_NEW_PMAP_MAGIC 0x504D /* "PM": new-type partition map */ #define HFS_SUPER_MAGIC 0x4244 /* "BD": HFS MDB (super block) */ -#define HFS_MFS_SUPER_MAGIC 0xD2D7 /* MFS MDB (super block) */ /* various FIXED size parameters */ #define HFS_SECTOR_SIZE 512 /* size of an HFS sector */ diff --git a/fs/hfsplus/part_tbl.c b/fs/hfsplus/part_tbl.c index 63164ebc52fa..ecda671d56a8 100644 --- a/fs/hfsplus/part_tbl.c +++ b/fs/hfsplus/part_tbl.c @@ -23,11 +23,9 @@ #define HFS_MDB_BLK 2 /* Block (w/i partition) of MDB */ /* magic numbers for various disk blocks */ -#define HFS_DRVR_DESC_MAGIC 0x4552 /* "ER": driver descriptor map */ #define HFS_OLD_PMAP_MAGIC 0x5453 /* "TS": old-type partition map */ #define HFS_NEW_PMAP_MAGIC 0x504D /* "PM": new-type partition map */ #define HFS_SUPER_MAGIC 0x4244 /* "BD": HFS MDB (super block) */ -#define HFS_MFS_SUPER_MAGIC 0xD2D7 /* MFS MDB (super block) */ /* * The new style Mac partition map -- 1.8.3.1
