* [NET] ioc3.c: replace remaining __FUNCTION__ occurrences
@ 2008-03-06 15:55 Ralf Baechle
2008-03-07 8:17 ` Andrew Morton
2008-03-17 12:13 ` Jeff Garzik
0 siblings, 2 replies; 4+ messages in thread
From: Ralf Baechle @ 2008-03-06 15:55 UTC (permalink / raw)
To: Jeff Garzik, Andrew Morton, netdev; +Cc: Harvey Harrison
From: Harvey Harrison <harvey.harrison@gmail.com>
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
drivers/sn/ioc3.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c
index 29fcd6d..c083274 100644
--- a/drivers/sn/ioc3.c
+++ b/drivers/sn/ioc3.c
@@ -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)
@@ -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);
@@ -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
@@ -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;
}
@@ -649,7 +649,7 @@ 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;
}
@@ -657,7 +657,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
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;
}
@@ -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;
}
@@ -709,7 +709,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);
}
if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED,
"ioc3-io", (void *)idd)) {
@@ -717,7 +717,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+2);
+ __func__, pdev->irq+2);
}
} else {
if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED,
@@ -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);
}
}
@@ -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;
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [NET] ioc3.c: replace remaining __FUNCTION__ occurrences
2008-03-06 15:55 [NET] ioc3.c: replace remaining __FUNCTION__ occurrences Ralf Baechle
@ 2008-03-07 8:17 ` Andrew Morton
2008-03-07 9:10 ` Ralf Baechle
2008-03-17 12:13 ` Jeff Garzik
1 sibling, 1 reply; 4+ messages in thread
From: Andrew Morton @ 2008-03-07 8:17 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Jeff Garzik, netdev, Harvey Harrison
On Thu, 6 Mar 2008 15:55:09 +0000 Ralf Baechle <ralf@linux-mips.org> wrote:
> From: Harvey Harrison <harvey.harrison@gmail.com>
>
> __FUNCTION__ is gcc-specific, use __func__
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
>
> drivers/sn/ioc3.c | 22 +++++++++++-----------
this isn't a net driver is it?
I already had it queued - I'll add your acked-by ;)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [NET] ioc3.c: replace remaining __FUNCTION__ occurrences
2008-03-07 8:17 ` Andrew Morton
@ 2008-03-07 9:10 ` Ralf Baechle
0 siblings, 0 replies; 4+ messages in thread
From: Ralf Baechle @ 2008-03-07 9:10 UTC (permalink / raw)
To: Andrew Morton; +Cc: Jeff Garzik, netdev, Harvey Harrison
On Fri, Mar 07, 2008 at 12:17:52AM -0800, Andrew Morton wrote:
> On Thu, 6 Mar 2008 15:55:09 +0000 Ralf Baechle <ralf@linux-mips.org> wrote:
>
> > From: Harvey Harrison <harvey.harrison@gmail.com>
> >
> > __FUNCTION__ is gcc-specific, use __func__
> >
> > Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> > Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
> >
> > drivers/sn/ioc3.c | 22 +++++++++++-----------
>
> this isn't a net driver is it?
-EFINGERSTOOFAST ;-)
(IOC3 is an everything and the kitchensink thing - ethernet, RTC, PS/2,
serial.)
Ralf
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [NET] ioc3.c: replace remaining __FUNCTION__ occurrences
2008-03-06 15:55 [NET] ioc3.c: replace remaining __FUNCTION__ occurrences Ralf Baechle
2008-03-07 8:17 ` Andrew Morton
@ 2008-03-17 12:13 ` Jeff Garzik
1 sibling, 0 replies; 4+ messages in thread
From: Jeff Garzik @ 2008-03-17 12:13 UTC (permalink / raw)
To: Ralf Baechle; +Cc: Andrew Morton, netdev, Harvey Harrison
Ralf Baechle wrote:
> From: Harvey Harrison <harvey.harrison@gmail.com>
>
> __FUNCTION__ is gcc-specific, use __func__
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
>
> drivers/sn/ioc3.c | 22 +++++++++++-----------
> 1 files changed, 11 insertions(+), 11 deletions(-)
applied
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2008-03-17 12:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-06 15:55 [NET] ioc3.c: replace remaining __FUNCTION__ occurrences Ralf Baechle
2008-03-07 8:17 ` Andrew Morton
2008-03-07 9:10 ` Ralf Baechle
2008-03-17 12:13 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).