diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-05 21:24:52 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2008-03-10 20:50:31 -0400 |
commit | 7f5e4e8d94b6013f93716bc42a1296f95d1059dc (patch) | |
tree | 9ededfd9307c8d2ca1d9e8f11d0f9d1b3a489c21 /drivers/ata/libata-core.c | |
parent | cdeeeae056a429e729ae9e914fa8142ee45bee93 (diff) |
ata: replace remaining __FUNCTION__ occurrences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/libata-core.c')
-rw-r--r-- | drivers/ata/libata-core.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4fbcce758b04..5310513b7573 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -1719,7 +1719,7 @@ void ata_port_flush_task(struct ata_port *ap) | |||
1719 | cancel_rearming_delayed_work(&ap->port_task); | 1719 | cancel_rearming_delayed_work(&ap->port_task); |
1720 | 1720 | ||
1721 | if (ata_msg_ctl(ap)) | 1721 | if (ata_msg_ctl(ap)) |
1722 | ata_port_printk(ap, KERN_DEBUG, "%s: EXIT\n", __FUNCTION__); | 1722 | ata_port_printk(ap, KERN_DEBUG, "%s: EXIT\n", __func__); |
1723 | } | 1723 | } |
1724 | 1724 | ||
1725 | static void ata_qc_complete_internal(struct ata_queued_cmd *qc) | 1725 | static void ata_qc_complete_internal(struct ata_queued_cmd *qc) |
@@ -2056,7 +2056,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class, | |||
2056 | int rc; | 2056 | int rc; |
2057 | 2057 | ||
2058 | if (ata_msg_ctl(ap)) | 2058 | if (ata_msg_ctl(ap)) |
2059 | ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __FUNCTION__); | 2059 | ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __func__); |
2060 | 2060 | ||
2061 | ata_dev_select(ap, dev->devno, 1, 1); /* select device 0/1 */ | 2061 | ata_dev_select(ap, dev->devno, 1, 1); /* select device 0/1 */ |
2062 | retry: | 2062 | retry: |
@@ -2253,12 +2253,12 @@ int ata_dev_configure(struct ata_device *dev) | |||
2253 | 2253 | ||
2254 | if (!ata_dev_enabled(dev) && ata_msg_info(ap)) { | 2254 | if (!ata_dev_enabled(dev) && ata_msg_info(ap)) { |
2255 | ata_dev_printk(dev, KERN_INFO, "%s: ENTER/EXIT -- nodev\n", | 2255 | ata_dev_printk(dev, KERN_INFO, "%s: ENTER/EXIT -- nodev\n", |
2256 | __FUNCTION__); | 2256 | __func__); |
2257 | return 0; | 2257 | return 0; |
2258 | } | 2258 | } |
2259 | 2259 | ||
2260 | if (ata_msg_probe(ap)) | 2260 | if (ata_msg_probe(ap)) |
2261 | ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __FUNCTION__); | 2261 | ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __func__); |
2262 | 2262 | ||
2263 | /* set horkage */ | 2263 | /* set horkage */ |
2264 | dev->horkage |= ata_dev_blacklisted(dev); | 2264 | dev->horkage |= ata_dev_blacklisted(dev); |
@@ -2279,7 +2279,7 @@ int ata_dev_configure(struct ata_device *dev) | |||
2279 | ata_dev_printk(dev, KERN_DEBUG, | 2279 | ata_dev_printk(dev, KERN_DEBUG, |
2280 | "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x " | 2280 | "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x " |
2281 | "85:%04x 86:%04x 87:%04x 88:%04x\n", | 2281 | "85:%04x 86:%04x 87:%04x 88:%04x\n", |
2282 | __FUNCTION__, | 2282 | __func__, |
2283 | id[49], id[82], id[83], id[84], | 2283 | id[49], id[82], id[83], id[84], |
2284 | id[85], id[86], id[87], id[88]); | 2284 | id[85], id[86], id[87], id[88]); |
2285 | 2285 | ||
@@ -2511,13 +2511,13 @@ int ata_dev_configure(struct ata_device *dev) | |||
2511 | 2511 | ||
2512 | if (ata_msg_probe(ap)) | 2512 | if (ata_msg_probe(ap)) |
2513 | ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n", | 2513 | ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n", |
2514 | __FUNCTION__, ata_chk_status(ap)); | 2514 | __func__, ata_chk_status(ap)); |
2515 | return 0; | 2515 | return 0; |
2516 | 2516 | ||
2517 | err_out_nosup: | 2517 | err_out_nosup: |
2518 | if (ata_msg_probe(ap)) | 2518 | if (ata_msg_probe(ap)) |
2519 | ata_dev_printk(dev, KERN_DEBUG, | 2519 | ata_dev_printk(dev, KERN_DEBUG, |
2520 | "%s: EXIT, err\n", __FUNCTION__); | 2520 | "%s: EXIT, err\n", __func__); |
2521 | return rc; | 2521 | return rc; |
2522 | } | 2522 | } |
2523 | 2523 | ||