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

Commit 1ad8e7f9 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: make some libata-core routines extern 



Make libata-core routines which will be used by EH implementation
extern.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent ece1d636

drivers/scsi/libata-core.c

+12 −17
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ static unsigned int ata_dev_init_params(struct ata_port *ap, 
					struct ata_device *dev,

					u16 heads,

					u16 sectors);

static int ata_down_xfermask_limit(struct ata_port *ap, struct ata_device *dev,

				   int force_pio0);

static int ata_down_sata_spd_limit(struct ata_port *ap);

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

static unsigned int ata_dev_set_xfermode(struct ata_port *ap,

					 struct ata_device *dev);

static void ata_dev_xfermask(struct ata_port *ap, struct ata_device *dev);
@@ -412,7 +408,7 @@ static const char *sata_spd_string(unsigned int spd) 
	return spd_str[spd - 1];

}



static void ata_dev_disable(struct ata_port *ap, struct ata_device *dev)

void ata_dev_disable(struct ata_port *ap, struct ata_device *dev)

{

	if (ata_dev_enabled(dev)) {

		printk(KERN_WARNING "ata%u: dev %u disabled\n",
@@ -979,8 +975,7 @@ void ata_qc_complete_internal(struct ata_queued_cmd *qc) 
 *	None.  Should be called with kernel context, might sleep.

 */



static unsigned

ata_exec_internal(struct ata_port *ap, struct ata_device *dev,

unsigned ata_exec_internal(struct ata_port *ap, struct ata_device *dev,

			   struct ata_taskfile *tf, const u8 *cdb,

			   int dma_dir, void *buf, unsigned int buflen)

{
@@ -1649,7 +1644,7 @@ void ata_port_disable(struct ata_port *ap) 
 *	RETURNS:

 *	0 on success, negative errno on failure

 */

static int ata_down_sata_spd_limit(struct ata_port *ap)

int ata_down_sata_spd_limit(struct ata_port *ap)

{

	u32 spd, mask;

	int highbit;
@@ -1709,7 +1704,7 @@ static int __ata_set_sata_spd_needed(struct ata_port *ap, u32 *scontrol) 
 *	RETURNS:

 *	1 if SATA spd configuration is needed, 0 otherwise.

 */

static int ata_set_sata_spd_needed(struct ata_port *ap)

int ata_set_sata_spd_needed(struct ata_port *ap)

{

	u32 scontrol;
@@ -1913,7 +1908,7 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed, 
 *	RETURNS:

 *	0 on success, negative errno on failure

 */

static int ata_down_xfermask_limit(struct ata_port *ap, struct ata_device *dev,

int ata_down_xfermask_limit(struct ata_port *ap, struct ata_device *dev,

			    int force_pio0)

{

	unsigned long xfer_mask;
@@ -1992,7 +1987,7 @@ static int ata_dev_set_mode(struct ata_port *ap, struct ata_device *dev) 
 *	RETURNS:

 *	0 on success, negative errno otherwise

 */

static int ata_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev)

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

{

	struct ata_device *dev;

	int i, rc = 0, used_dma = 0, found = 0;
@@ -2590,7 +2585,7 @@ int ata_std_probe_reset(struct ata_port *ap, unsigned int *classes) 
				     ata_std_postreset, classes);

}



static int ata_do_reset(struct ata_port *ap,

int ata_do_reset(struct ata_port *ap,

		 ata_reset_fn_t reset, ata_postreset_fn_t postreset,

		 int verbose, unsigned int *classes)

{

drivers/scsi/libata.h

+13 −0
Original line number Diff line number Diff line
@@ -45,7 +45,20 @@ extern int libata_fua; 
extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap,

				      struct ata_device *dev);

extern int ata_rwcmd_protocol(struct ata_queued_cmd *qc);

extern void ata_dev_disable(struct ata_port *ap, struct ata_device *dev);

extern void ata_port_flush_task(struct ata_port *ap);

extern unsigned ata_exec_internal(struct ata_port *ap, struct ata_device *dev,

				  struct ata_taskfile *tf, const u8 *cdb,

				  int dma_dir, void *buf, unsigned int buflen);

extern int ata_down_sata_spd_limit(struct ata_port *ap);

extern int ata_set_sata_spd_needed(struct ata_port *ap);

extern int ata_down_xfermask_limit(struct ata_port *ap, 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,

			ata_postreset_fn_t postreset,

			int verbose, unsigned int *classes);

extern void ata_qc_free(struct ata_queued_cmd *qc);

extern void ata_qc_issue(struct ata_queued_cmd *qc);

extern int ata_check_atapi_dma(struct ata_queued_cmd *qc);