grub-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] unix/getroot: remove unused MAJOR definition


From: Andrei Borzenkov
Subject: [PATCH] unix/getroot: remove unused MAJOR definition
Date: Sat, 7 Nov 2015 09:44:54 +0300

We use major() everywhere, these definitions just add to confusion.

---
 grub-core/osdep/unix/getroot.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
index 14d483f..1079a91 100644
--- a/grub-core/osdep/unix/getroot.c
+++ b/grub-core/osdep/unix/getroot.c
@@ -45,12 +45,6 @@
 #ifdef __linux__
 #include <sys/ioctl.h>         /* ioctl */
 #include <sys/mount.h>
-#ifndef MAJOR
-# ifndef MINORBITS
-#  define MINORBITS    8
-# endif /* ! MINORBITS */
-# define MAJOR(dev)    ((unsigned) ((dev) >> MINORBITS))
-#endif /* ! MAJOR */
 #ifndef FLOPPY_MAJOR
 # define FLOPPY_MAJOR  2
 #endif /* ! FLOPPY_MAJOR */
@@ -73,7 +67,6 @@
 #include <grub/emu/getroot.h>
 
 #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
-# define MAJOR(dev) major(dev)
 # define FLOPPY_MAJOR  2
 #endif
 
@@ -90,7 +83,6 @@
 #endif /* defined(__NetBSD__) || defined(__FreeBSD__) || 
defined(__FreeBSD_kernel__) */
 
 #if defined(__NetBSD__) || defined(__OpenBSD__)
-# define MAJOR(dev) major(dev)
 # ifdef HAVE_GETRAWPARTITION
 #  include <util.h>    /* getrawpartition */
 # endif /* HAVE_GETRAWPARTITION */
-- 
tg: (1018e91..) u/kill-MAJOR (depends on: master)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]