2009-04-17 Pavel Roskin <proski@gnu.org>

	* disk/ata.c (grub_ata_pciinit): Use NESTED_FUNC_ATTR.
	* bus/usb/ohci.c (grub_ohci_pci_iter): Likewise.
	* bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
	* commands/lspci.c (grub_lspci_iter): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 0c50854597adc8c89cd1c6050991e5ba9518fc52..e99fdd53bad09dd76c751905693115a142164f52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-17  Pavel Roskin  <proski@gnu.org>
+
+       * disk/ata.c (grub_ata_pciinit): Use NESTED_FUNC_ATTR.
+       * bus/usb/ohci.c (grub_ohci_pci_iter): Likewise.
+       * bus/usb/uhci.c (grub_uhci_pci_iter): Likewise.
+       * commands/lspci.c (grub_lspci_iter): Likewise.
+
 2009-04-16  Bean  <bean123ch@gmail.com>
 
        * commands/efi/loadbios.c (grub_cmd_fakebios): Add missing return

diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c
index d2e78d4c99d473d1ef2aea2e53b62d8fe2f921c9..4887548700eeabf667a4ee81b5bb147737c2ba87 100644 (file)
--- a/bus/usb/ohci.c
+++ b/bus/usb/ohci.c
@@ -112,8 +112,9 @@ grub_ohci_writereg32 (struct grub_ohci *o,
 
 /* Iterate over all PCI devices.  Determine if a device is an OHCI
    controller.  If this is the case, initialize it.  */
-static int grub_ohci_pci_iter (int bus, int device, int func,
-                              grub_pci_id_t pciid __attribute__((unused)))
+static int NESTED_FUNC_ATTR
+grub_ohci_pci_iter (int bus, int device, int func,
+                   grub_pci_id_t pciid __attribute__((unused)))
 {
   grub_uint32_t class;
   grub_uint32_t subclass;

diff --git a/bus/usb/uhci.c b/bus/usb/uhci.c
index c59c0ca7d158ccba648b4f654d8da8216a26d8e0..8406aed28e1f09627f256d59a92cb33d775397af 100644 (file)
--- a/bus/usb/uhci.c
+++ b/bus/usb/uhci.c
@@ -137,8 +137,9 @@ grub_uhci_portstatus (grub_usb_controller_t dev,
 
 /* Iterate over all PCI devices.  Determine if a device is an UHCI
    controller.  If this is the case, initialize it.  */
-static int grub_uhci_pci_iter (int bus, int device, int func,
-                              grub_pci_id_t pciid __attribute__((unused)))
+static int NESTED_FUNC_ATTR
+grub_uhci_pci_iter (int bus, int device, int func,
+                   grub_pci_id_t pciid __attribute__((unused)))
 {
   grub_uint32_t class;
   grub_uint32_t subclass;

diff --git a/commands/lspci.c b/commands/lspci.c
index a084b42d70610d3bdc4628ecb4fa60d1c4f05a37..36bc7608fee1e8fc272c2592387be096de765ee1 100644 (file)
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -114,7 +114,7 @@ grub_pci_get_class (int class, int subclass)
   return 0;
 }
 
-static int
+static int NESTED_FUNC_ATTR
 grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid)
 {
   grub_uint32_t class;

diff --git a/disk/ata.c b/disk/ata.c
index ed98b0b878ad411bb7229e3292fb988e5b1d297c..fe637201157c209572683562c4fde5277c4583d6 100644 (file)
--- a/disk/ata.c
+++ b/disk/ata.c
@@ -375,7 +375,7 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
   return 0;
 }
 
-static int
+static int NESTED_FUNC_ATTR
 grub_ata_pciinit (int bus, int device, int func,
                  grub_pci_id_t pciid __attribute__((unused)))
 {