Commit d14d41cc authored by Sergey Shtylyov's avatar Sergey Shtylyov Committed by Damien Le Moal
Browse files

ata: fix debounce timings type 



sata_deb_timing_{hotplug|long|normal}[] store 'unsigned long' debounce
timeouts in ms, while sata_link_debounce() eventually uses those timeouts
by calling ata_{deadline|msleep}( which take just 'unsigned int'.  Change
the debounce timeout table element's type to 'unsigned int' -- all these
timeouts happily fit into 'unsigned int'...

Signed-off-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Signed-off-by: default avatarDamien Le Moal <dlemoal@kernel.org>
parent ca02f225

drivers/ata/ahci.c

+1 −1
Original line number Diff line number Diff line
@@ -807,7 +807,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, 
static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class,

			      unsigned long deadline)

{

	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);

	const unsigned int *timing = sata_ehc_deb_timing(&link->eh_context);

	struct ata_port *ap = link->ap;

	struct ahci_port_priv *pp = ap->private_data;

	struct ahci_host_priv *hpriv = ap->host->private_data;

drivers/ata/ahci_qoriq.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ MODULE_DEVICE_TABLE(acpi, ahci_qoriq_acpi_match); 
static int ahci_qoriq_hardreset(struct ata_link *link, unsigned int *class,

			  unsigned long deadline)

{

	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);

	const unsigned int *timing = sata_ehc_deb_timing(&link->eh_context);

	void __iomem *port_mmio = ahci_port_base(link->ap);

	u32 px_cmd, px_is, px_val;

	struct ata_port *ap = link->ap;

drivers/ata/ahci_xgene.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ static void xgene_ahci_set_phy_cfg(struct xgene_ahci_context *ctx, int channel) 
static int xgene_ahci_do_hardreset(struct ata_link *link,

				   unsigned long deadline, bool *online)

{

	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);

	const unsigned int *timing = sata_ehc_deb_timing(&link->eh_context);

	struct ata_port *ap = link->ap;

	struct ahci_host_priv *hpriv = ap->host->private_data;

	struct xgene_ahci_context *ctx = hpriv->plat_data;

drivers/ata/libahci.c

+1 −1
Original line number Diff line number Diff line
@@ -1587,7 +1587,7 @@ static int ahci_pmp_retry_softreset(struct ata_link *link, unsigned int *class, 
int ahci_do_hardreset(struct ata_link *link, unsigned int *class,

		      unsigned long deadline, bool *online)

{

	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);

	const unsigned int *timing = sata_ehc_deb_timing(&link->eh_context);

	struct ata_port *ap = link->ap;

	struct ahci_port_priv *pp = ap->private_data;

	struct ahci_host_priv *hpriv = ap->host->private_data;

drivers/ata/libata-core.c

+2 −2
Original line number Diff line number Diff line
@@ -3782,7 +3782,7 @@ int ata_std_prereset(struct ata_link *link, unsigned long deadline) 
{

	struct ata_port *ap = link->ap;

	struct ata_eh_context *ehc = &link->eh_context;

	const unsigned long *timing = sata_ehc_deb_timing(ehc);

	const unsigned int *timing = sata_ehc_deb_timing(ehc);

	int rc;



	/* if we're about to do hardreset, nothing more to do */
@@ -3824,7 +3824,7 @@ EXPORT_SYMBOL_GPL(ata_std_prereset); 
int sata_std_hardreset(struct ata_link *link, unsigned int *class,

		       unsigned long deadline)

{

	const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context);

	const unsigned int *timing = sata_ehc_deb_timing(&link->eh_context);

	bool online;

	int rc;