|
@@ -1719,7 +1719,7 @@ void ata_port_flush_task(struct ata_port *ap)
|
|
cancel_rearming_delayed_work(&ap->port_task);
|
|
cancel_rearming_delayed_work(&ap->port_task);
|
|
|
|
|
|
if (ata_msg_ctl(ap))
|
|
if (ata_msg_ctl(ap))
|
|
- ata_port_printk(ap, KERN_DEBUG, "%s: EXIT\n", __FUNCTION__);
|
|
|
|
|
|
+ ata_port_printk(ap, KERN_DEBUG, "%s: EXIT\n", __func__);
|
|
}
|
|
}
|
|
|
|
|
|
static void ata_qc_complete_internal(struct ata_queued_cmd *qc)
|
|
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,
|
|
int rc;
|
|
int rc;
|
|
|
|
|
|
if (ata_msg_ctl(ap))
|
|
if (ata_msg_ctl(ap))
|
|
- ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __FUNCTION__);
|
|
|
|
|
|
+ ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __func__);
|
|
|
|
|
|
ata_dev_select(ap, dev->devno, 1, 1); /* select device 0/1 */
|
|
ata_dev_select(ap, dev->devno, 1, 1); /* select device 0/1 */
|
|
retry:
|
|
retry:
|
|
@@ -2253,12 +2253,12 @@ int ata_dev_configure(struct ata_device *dev)
|
|
|
|
|
|
if (!ata_dev_enabled(dev) && ata_msg_info(ap)) {
|
|
if (!ata_dev_enabled(dev) && ata_msg_info(ap)) {
|
|
ata_dev_printk(dev, KERN_INFO, "%s: ENTER/EXIT -- nodev\n",
|
|
ata_dev_printk(dev, KERN_INFO, "%s: ENTER/EXIT -- nodev\n",
|
|
- __FUNCTION__);
|
|
|
|
|
|
+ __func__);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
if (ata_msg_probe(ap))
|
|
if (ata_msg_probe(ap))
|
|
- ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __FUNCTION__);
|
|
|
|
|
|
+ ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER\n", __func__);
|
|
|
|
|
|
/* set horkage */
|
|
/* set horkage */
|
|
dev->horkage |= ata_dev_blacklisted(dev);
|
|
dev->horkage |= ata_dev_blacklisted(dev);
|
|
@@ -2279,7 +2279,7 @@ int ata_dev_configure(struct ata_device *dev)
|
|
ata_dev_printk(dev, KERN_DEBUG,
|
|
ata_dev_printk(dev, KERN_DEBUG,
|
|
"%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x "
|
|
"%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x "
|
|
"85:%04x 86:%04x 87:%04x 88:%04x\n",
|
|
"85:%04x 86:%04x 87:%04x 88:%04x\n",
|
|
- __FUNCTION__,
|
|
|
|
|
|
+ __func__,
|
|
id[49], id[82], id[83], id[84],
|
|
id[49], id[82], id[83], id[84],
|
|
id[85], id[86], id[87], id[88]);
|
|
id[85], id[86], id[87], id[88]);
|
|
|
|
|
|
@@ -2511,13 +2511,13 @@ int ata_dev_configure(struct ata_device *dev)
|
|
|
|
|
|
if (ata_msg_probe(ap))
|
|
if (ata_msg_probe(ap))
|
|
ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n",
|
|
ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n",
|
|
- __FUNCTION__, ata_chk_status(ap));
|
|
|
|
|
|
+ __func__, ata_chk_status(ap));
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
err_out_nosup:
|
|
err_out_nosup:
|
|
if (ata_msg_probe(ap))
|
|
if (ata_msg_probe(ap))
|
|
ata_dev_printk(dev, KERN_DEBUG,
|
|
ata_dev_printk(dev, KERN_DEBUG,
|
|
- "%s: EXIT, err\n", __FUNCTION__);
|
|
|
|
|
|
+ "%s: EXIT, err\n", __func__);
|
|
return rc;
|
|
return rc;
|
|
}
|
|
}
|
|
|
|
|