From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1ZuxFN-0005uB-Qt for mharc-grub-devel@gnu.org; Sat, 07 Nov 2015 01:45:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuxFK-0005qZ-K6 for grub-devel@gnu.org; Sat, 07 Nov 2015 01:45:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuxFF-0000qf-Jm for grub-devel@gnu.org; Sat, 07 Nov 2015 01:45:06 -0500 Received: from mail-lf0-x22e.google.com ([2a00:1450:4010:c07::22e]:36722) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuxFF-0000pY-CY for grub-devel@gnu.org; Sat, 07 Nov 2015 01:45:01 -0500 Received: by lfs39 with SMTP id 39so50640062lfs.3 for ; Fri, 06 Nov 2015 22:45:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=Qk5LrR2ZQD4MGcCd1WpqGIuedjT8zOz9Rp7jXeBkbMw=; b=tt6Nif/v454HxGbkSQb+REbc6pnEUpFfawI98Cw/CVwG08ijag4aiAPtGy/Z1tgnfF yNiY0HUrGaHt1WTgi6S+xl6co/xUHv8Psg/8yarHpaWecpMLdxQLmR+zK2dWCayhsQrs xOzizsrFMXvLmhP/Hz3KPgiLoJZXA5nw3TngQpGo0C973Y6hSqUIAuRIMI2bXd60DAeb xserHOBxP5V/LRFeMikKpvHkas28DdB9Ck6YnSSlfEA/mVjELUpz77kIkbMIu12S21PU eLosJg3DyopTgHOPyGB8BL/R85YV0G/JDJx/FOla+t60NKC2EvCaEarhTZngY9pXGla6 lysg== X-Received: by 10.25.7.2 with SMTP id 2mr5177413lfh.107.1446878700550; Fri, 06 Nov 2015 22:45:00 -0800 (PST) Received: from localhost.localdomain (ppp91-76-25-247.pppoe.mtu-net.ru. [91.76.25.247]) by smtp.gmail.com with ESMTPSA id i186sm619242lfb.18.2015.11.06.22.44.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 06 Nov 2015 22:44:59 -0800 (PST) From: Andrei Borzenkov To: grub-devel@gnu.org Subject: [PATCH] unix/getroot: remove unused MAJOR definition Date: Sat, 7 Nov 2015 09:44:54 +0300 Message-Id: <1446878694-31122-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.9.1 X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c07::22e X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 06:45:07 -0000 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 /* 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 */ -- tg: (1018e91..) u/kill-MAJOR (depends on: master)