Commit 2b384ede authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Jens Axboe
Browse files

ata: move sata_deb_timing_*() to libata-sata.c 



* move sata_deb_timing_*() to libata-sata.c

* add static inline for sata_ehc_deb_timing() for
  CONFIG_SATA_HOST=n case

Code size savings on m68k arch using (modified) atari_defconfig:

   text    data     bss     dec     hex filename
before:
  32158     572      40   32770    8002 drivers/ata/libata-core.o
after:
  32015     572      40   32627    7f73 drivers/ata/libata-core.o

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 61a11986

drivers/ata/libata-core.c

+0 −8
Original line number Diff line number Diff line
@@ -65,14 +65,6 @@ 
#include "libata.h"

#include "libata-transport.h"



/* debounce timing parameters in msecs { interval, duration, timeout } */

const unsigned long sata_deb_timing_normal[]		= {   5,  100, 2000 };

EXPORT_SYMBOL_GPL(sata_deb_timing_normal);

const unsigned long sata_deb_timing_hotplug[]		= {  25,  500, 2000 };

EXPORT_SYMBOL_GPL(sata_deb_timing_hotplug);

const unsigned long sata_deb_timing_long[]		= { 100, 2000, 5000 };

EXPORT_SYMBOL_GPL(sata_deb_timing_long);



const struct ata_port_operations ata_base_port_ops = {

	.prereset		= ata_std_prereset,

	.postreset		= ata_std_postreset,

drivers/ata/libata-sata.c

+8 −0
Original line number Diff line number Diff line
@@ -12,6 +12,14 @@ 


#include "libata.h"



/* debounce timing parameters in msecs { interval, duration, timeout } */

const unsigned long sata_deb_timing_normal[]		= {   5,  100, 2000 };

EXPORT_SYMBOL_GPL(sata_deb_timing_normal);

const unsigned long sata_deb_timing_hotplug[]		= {  25,  500, 2000 };

EXPORT_SYMBOL_GPL(sata_deb_timing_hotplug);

const unsigned long sata_deb_timing_long[]		= { 100, 2000, 5000 };

EXPORT_SYMBOL_GPL(sata_deb_timing_long);



/**

 *	sata_scr_valid - test whether SCRs are accessible

 *	@link: ATA link to test SCR accessibility for

include/linux/libata.h

+18 −13
Original line number Diff line number Diff line
@@ -1019,10 +1019,6 @@ struct ata_timing { 
/*

 * Core layer - drivers/ata/libata-core.c

 */

extern const unsigned long sata_deb_timing_normal[];

extern const unsigned long sata_deb_timing_hotplug[];

extern const unsigned long sata_deb_timing_long[];



extern struct ata_port_operations ata_dummy_port_ops;

extern const struct ata_port_info ata_dummy_port_info;
@@ -1060,15 +1056,6 @@ static inline int is_multi_taskfile(struct ata_taskfile *tf) 
	       (tf->command == ATA_CMD_WRITE_MULTI_FUA_EXT);

}



static inline const unsigned long *

sata_ehc_deb_timing(struct ata_eh_context *ehc)

{

	if (ehc->i.flags & ATA_EHI_HOTPLUGGED)

		return sata_deb_timing_hotplug;

	else

		return sata_deb_timing_normal;

}



static inline int ata_port_is_dummy(struct ata_port *ap)

{

	return ap->ops == &ata_dummy_port_ops;
@@ -1181,6 +1168,19 @@ extern void ata_scsi_cmd_error_handler(struct Scsi_Host *host, struct ata_port * 
 * SATA specific code - drivers/ata/libata-sata.c

 */

#ifdef CONFIG_SATA_HOST

extern const unsigned long sata_deb_timing_normal[];

extern const unsigned long sata_deb_timing_hotplug[];

extern const unsigned long sata_deb_timing_long[];



static inline const unsigned long *

sata_ehc_deb_timing(struct ata_eh_context *ehc)

{

	if (ehc->i.flags & ATA_EHI_HOTPLUGGED)

		return sata_deb_timing_hotplug;

	else

		return sata_deb_timing_normal;

}



extern int sata_scr_valid(struct ata_link *link);

extern int sata_scr_read(struct ata_link *link, int reg, u32 *val);

extern int sata_scr_write(struct ata_link *link, int reg, u32 val);
@@ -1192,6 +1192,11 @@ extern int sata_link_hardreset(struct ata_link *link, 
extern int sata_link_resume(struct ata_link *link, const unsigned long *params,

			    unsigned long deadline);

#else

static inline const unsigned long *

sata_ehc_deb_timing(struct ata_eh_context *ehc)

{

	return NULL;

}

static inline int sata_scr_valid(struct ata_link *link) { return 0; }

static inline int sata_scr_read(struct ata_link *link, int reg, u32 *val)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE