Skip to contentSkip to conversation

unix/getroot: remove unused MAJOR definition

PATCH In review Andrei Borzenkov 2 participants 2 messages Nov 7, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 unix/getroot: remove unused MAJOR definition

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

---
 grub-core/osdep/unix/getroot.c | 8 --------
 1 file changed, 8 deletions(-)
grub-core/osdep/unix/getroot.c +0 -8
index 14d483f..1079a91 100644
@@ -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 */
Signature · 1 line
tg: (1018e91..) u/kill-MAJOR (depends on: master)
#1 lore raw

Go ahead

Quoted 49 lines · Andrei Borzenkov

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

---
 grub-core/osdep/unix/getroot.c | 8 --------
 1 file changed, 8 deletions(-)
grub-core/osdep/unix/getroot.c +0 -7
index 14d483f..1079a91 100644
@@ -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)

_______________________________________________
Grub-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/grub-devel