Commit d87fa38e authored by Tejun Heo's avatar Tejun Heo
Browse files

[PATCH] libata-hp: move ata_do_reset() to libata-eh.c 



With ops->probe_init() gone, no user is left in libata-core.c.  Move
ata_do_reset() to libata-eh.c and make it static.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
parent 52783c5d

drivers/scsi/libata-core.c

+0 −28
Original line number Diff line number Diff line
@@ -2783,34 +2783,6 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes) 
	DPRINTK("EXIT\n");

}



int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,

		 unsigned int *classes)

{

	int i, rc;



	for (i = 0; i < ATA_MAX_DEVICES; i++)

		classes[i] = ATA_DEV_UNKNOWN;



	rc = reset(ap, classes);

	if (rc)

		return rc;



	/* If any class isn't ATA_DEV_UNKNOWN, consider classification

	 * is complete and convert all ATA_DEV_UNKNOWN to

	 * ATA_DEV_NONE.

	 */

	for (i = 0; i < ATA_MAX_DEVICES; i++)

		if (classes[i] != ATA_DEV_UNKNOWN)

			break;



	if (i < ATA_MAX_DEVICES)

		for (i = 0; i < ATA_MAX_DEVICES; i++)

			if (classes[i] == ATA_DEV_UNKNOWN)

				classes[i] = ATA_DEV_NONE;



	return 0;

}



/**

 *	ata_dev_same_device - Determine whether new ID matches configured device

 *	@dev: device to compare against

drivers/scsi/libata-eh.c

+28 −0
Original line number Diff line number Diff line
@@ -1355,6 +1355,34 @@ static void ata_eh_report(struct ata_port *ap) 
	}

}



static int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,

			unsigned int *classes)

{

	int i, rc;



	for (i = 0; i < ATA_MAX_DEVICES; i++)

		classes[i] = ATA_DEV_UNKNOWN;



	rc = reset(ap, classes);

	if (rc)

		return rc;



	/* If any class isn't ATA_DEV_UNKNOWN, consider classification

	 * is complete and convert all ATA_DEV_UNKNOWN to

	 * ATA_DEV_NONE.

	 */

	for (i = 0; i < ATA_MAX_DEVICES; i++)

		if (classes[i] != ATA_DEV_UNKNOWN)

			break;



	if (i < ATA_MAX_DEVICES)

		for (i = 0; i < ATA_MAX_DEVICES; i++)

			if (classes[i] == ATA_DEV_UNKNOWN)

				classes[i] = ATA_DEV_NONE;



	return 0;

}



static int ata_eh_followup_srst_needed(int rc, int classify,

				       const unsigned int *classes)

{

drivers/scsi/libata.h

+0 −2
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ extern int sata_down_spd_limit(struct ata_port *ap); 
extern int sata_set_spd_needed(struct ata_port *ap);

extern int ata_down_xfermask_limit(struct ata_device *dev, int force_pio0);

extern int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev);

extern int ata_do_reset(struct ata_port *ap, ata_reset_fn_t reset,

			unsigned int *classes);

extern void ata_qc_free(struct ata_queued_cmd *qc);

extern void ata_qc_issue(struct ata_queued_cmd *qc);

extern void __ata_qc_complete(struct ata_queued_cmd *qc);