Skip to content

Commit

Permalink
ioc3.c: replace remaining __FUNCTION__ occurrences
Browse files Browse the repository at this point in the history 
__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: Harvey Harrison <[email protected]>
Signed-off-by: Ralf Baechle <[email protected]>

 drivers/sn/ioc3.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
Signed-off-by: Jeff Garzik <[email protected]>
  • Loading branch information
@hharrison
hharrison authored and Jeff Garzik committed Mar 17, 2008
1 parent ffea31e commit 9150c97
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions drivers/sn/ioc3.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@ void ioc3_unregister_submodule(struct ioc3_submodule *is)
printk(KERN_WARNING
"%s: IOC3 submodule %s remove failed "
"for pci_dev %s.\n",
__FUNCTION__, module_name(is->owner),
__func__, module_name(is->owner),
pci_name(idd->pdev));
idd->active[is->id] = 0;
if(is->irq_mask)
Expand Down Expand Up @@ -611,7 +611,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
if ((ret = pci_enable_device(pdev))) {
printk(KERN_WARNING
"%s: Failed to enable IOC3 device for pci_dev %s.\n",
__FUNCTION__, pci_name(pdev));
__func__, pci_name(pdev));
goto out;
}
pci_set_master(pdev);
Expand All @@ -623,7 +623,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",
__FUNCTION__);
__func__);
}
}
#endif
Expand All @@ -633,7 +633,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
if (!idd) {
printk(KERN_WARNING
"%s: Failed to allocate IOC3 data for pci_dev %s.\n",
__FUNCTION__, pci_name(pdev));
__func__, pci_name(pdev));
ret = -ENODEV;
goto out_idd;
}
Expand All @@ -649,15 +649,15 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
printk(KERN_WARNING
"%s: Unable to find IOC3 resource "
"for pci_dev %s.\n",
__FUNCTION__, pci_name(pdev));
__func__, pci_name(pdev));
ret = -ENODEV;
goto out_pci;
}
if (!request_mem_region(idd->pma, IOC3_PCI_SIZE, "ioc3")) {
printk(KERN_WARNING
"%s: Unable to request IOC3 region "
"for pci_dev %s.\n",
__FUNCTION__, pci_name(pdev));
__func__, pci_name(pdev));
ret = -ENODEV;
goto out_pci;
}
Expand All @@ -666,7 +666,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
printk(KERN_WARNING
"%s: Unable to remap IOC3 region "
"for pci_dev %s.\n",
__FUNCTION__, pci_name(pdev));
__func__, pci_name(pdev));
ret = -ENODEV;
goto out_misc_region;
}
Expand Down Expand Up @@ -709,15 +709,15 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
__FUNCTION__, pdev->irq);
__func__, pdev->irq);
}
if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED,
"ioc3-io", (void *)idd)) {
idd->irq_io = pdev->irq+2;
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
__FUNCTION__, pdev->irq+2);
__func__, pdev->irq+2);
}
} else {
if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED,
Expand All @@ -726,7 +726,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
__FUNCTION__, pdev->irq);
__func__, pdev->irq);
}
}

Expand Down Expand Up @@ -769,7 +769,7 @@ static void ioc3_remove(struct pci_dev *pdev)
printk(KERN_WARNING
"%s: IOC3 submodule 0x%s remove failed "
"for pci_dev %s.\n",
__FUNCTION__,
__func__,
module_name(ioc3_submodules[id]->owner),
pci_name(pdev));
idd->active[id] = 0;
Expand Down

0 comments on commit 9150c97

Please sign in to comment.