From dff8d0e3f59c1f1888527078c3a04f863ce33e64 Mon Sep 17 00:00:00 2001 From: Andrei Borzenkov Date: Sat, 7 Nov 2015 17:02:21 +0300 Subject: [PATCH] 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(-) diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c index 14d483fb1..1079a919d 100644 --- a/grub-core/osdep/unix/getroot.c +++ b/grub-core/osdep/unix/getroot.c @@ -45,12 +45,6 @@ #ifdef __linux__ #include /* ioctl */ #include -#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 #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 /* getrawpartition */ # endif /* HAVE_GETRAWPARTITION */