From d1a282fc83f58a34b16f5034fda5b5083815d1b0 Mon Sep 17 00:00:00 2001 From: proski Date: Fri, 17 Apr 2009 15:36:41 +0000 Subject: [PATCH] 2009-04-17 Pavel Roskin * 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. --- ChangeLog | 7 +++++++ bus/usb/ohci.c | 5 +++-- bus/usb/uhci.c | 5 +++-- commands/lspci.c | 2 +- disk/ata.c | 2 +- 5 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c5085459..e99fdd53b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-04-17 Pavel Roskin + + * 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 * commands/efi/loadbios.c (grub_cmd_fakebios): Add missing return diff --git a/bus/usb/ohci.c b/bus/usb/ohci.c index d2e78d4c9..488754870 100644 --- 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 c59c0ca7d..8406aed28 100644 --- 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 a084b42d7..36bc7608f 100644 --- 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 ed98b0b87..fe6372011 100644 --- 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))) {