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

ata: libata-core: fix parameter types of ata_wait_register() 



ata_wait_register() passes its 'unsigned long {interval|timeout}' params
verbatim to ata_{msleep|deadline}() that just take 'unsigned int' param
for the time intervals in ms -- eliminate unneeded implicit casts...

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

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -6684,7 +6684,7 @@ EXPORT_SYMBOL_GPL(ata_msleep); 
 *	The final register value.

 */

u32 ata_wait_register(struct ata_port *ap, void __iomem *reg, u32 mask, u32 val,

		      unsigned long interval, unsigned long timeout)

		      unsigned int interval, unsigned int timeout)

{

	unsigned long deadline;

	u32 tmp;

include/linux/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -1116,7 +1116,7 @@ static inline void ata_sas_port_resume(struct ata_port *ap) 
extern int ata_ratelimit(void);

extern void ata_msleep(struct ata_port *ap, unsigned int msecs);

extern u32 ata_wait_register(struct ata_port *ap, void __iomem *reg, u32 mask,

			u32 val, unsigned long interval, unsigned long timeout);

			     u32 val, unsigned int interval, unsigned int timeout);

extern int atapi_cmd_type(u8 opcode);

extern unsigned int ata_pack_xfermask(unsigned int pio_mask,

				      unsigned int mwdma_mask,