Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f5e4e8d authored by Harvey Harrison's avatar Harvey Harrison Committed by Jeff Garzik
Browse files

ata: replace remaining __FUNCTION__ occurrences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent cdeeeae0

drivers/ata/libata-acpi.c

+4 −4
Original line number Diff line number Diff line
@@ -382,7 +382,7 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 


	if (ata_msg_probe(ap))

		ata_dev_printk(dev, KERN_DEBUG, "%s: ENTER: port#: %d\n",

			       __FUNCTION__, ap->port_no);

			       __func__, ap->port_no);



	/* _GTF has no input parameters */

	status = acpi_evaluate_object(dev->acpi_handle, "_GTF", NULL, &output);
@@ -402,7 +402,7 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 
		if (ata_msg_probe(ap))

			ata_dev_printk(dev, KERN_DEBUG, "%s: Run _GTF: "

				"length or ptr is NULL (0x%llx, 0x%p)\n",

				__FUNCTION__,

				__func__,

				(unsigned long long)output.length,

				output.pointer);

		rc = -EINVAL;
@@ -432,7 +432,7 @@ static int ata_dev_get_GTF(struct ata_device *dev, struct ata_acpi_gtf **gtf) 
		if (ata_msg_probe(ap))

			ata_dev_printk(dev, KERN_DEBUG,

				       "%s: returning gtf=%p, gtf_count=%d\n",

				       __FUNCTION__, *gtf, rc);

				       __func__, *gtf, rc);

	}

	return rc;
@@ -725,7 +725,7 @@ static int ata_acpi_push_id(struct ata_device *dev) 


	if (ata_msg_probe(ap))

		ata_dev_printk(dev, KERN_DEBUG, "%s: ix = %d, port#: %d\n",

			       __FUNCTION__, dev->devno, ap->port_no);

			       __func__, dev->devno, ap->port_no);



	/* Give the drive Identify data to the drive via the _SDD method */

	/* _SDD: set up input parameters */

drivers/ata/libata-core.c

+7 −7
Original line number Diff line number Diff line
@@ -1719,7 +1719,7 @@ void ata_port_flush_task(struct ata_port *ap) 
	cancel_rearming_delayed_work(&ap->port_task);



	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)
@@ -2056,7 +2056,7 @@ int ata_dev_read_id(struct ata_device *dev, unsigned int *p_class, 
	int rc;



	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 */

 retry:
@@ -2253,12 +2253,12 @@ int ata_dev_configure(struct ata_device *dev) 


	if (!ata_dev_enabled(dev) && ata_msg_info(ap)) {

		ata_dev_printk(dev, KERN_INFO, "%s: ENTER/EXIT -- nodev\n",

			       __FUNCTION__);

			       __func__);

		return 0;

	}



	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 */

	dev->horkage |= ata_dev_blacklisted(dev);
@@ -2279,7 +2279,7 @@ int ata_dev_configure(struct ata_device *dev) 
		ata_dev_printk(dev, KERN_DEBUG,

			       "%s: cfg 49:%04x 82:%04x 83:%04x 84:%04x "

			       "85:%04x 86:%04x 87:%04x 88:%04x\n",

			       __FUNCTION__,

			       __func__,

			       id[49], id[82], id[83], id[84],

			       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))

		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;



err_out_nosup:

	if (ata_msg_probe(ap))

		ata_dev_printk(dev, KERN_DEBUG,

			       "%s: EXIT, err\n", __FUNCTION__);

			       "%s: EXIT, err\n", __func__);

	return rc;

}

drivers/ata/pata_pdc2027x.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ 
#undef PDC_DEBUG



#ifdef PDC_DEBUG

#define PDPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __FUNCTION__, ## args)

#define PDPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args)

#else

#define PDPRINTK(fmt, args...)

#endif