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.
This commit is contained in:
proski 2009-04-17 15:36:41 +00:00
parent a96df3f249
commit d1a282fc83
5 changed files with 15 additions and 6 deletions

View file

@ -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> 2009-04-16 Bean <bean123ch@gmail.com>
* commands/efi/loadbios.c (grub_cmd_fakebios): Add missing return * commands/efi/loadbios.c (grub_cmd_fakebios): Add missing return

View file

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

View file

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

View file

@ -114,7 +114,7 @@ grub_pci_get_class (int class, int subclass)
return 0; return 0;
} }
static int static int NESTED_FUNC_ATTR
grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid) grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid)
{ {
grub_uint32_t class; grub_uint32_t class;

View file

@ -375,7 +375,7 @@ grub_ata_device_initialize (int port, int device, int addr, int addr2)
return 0; return 0;
} }
static int static int NESTED_FUNC_ATTR
grub_ata_pciinit (int bus, int device, int func, grub_ata_pciinit (int bus, int device, int func,
grub_pci_id_t pciid __attribute__((unused))) grub_pci_id_t pciid __attribute__((unused)))
{ {