aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Sergey Shtylyov <s.shtylyov@omp.ru> 2023-07-29 23:17:47 +0300
committerGravatar Damien Le Moal <dlemoal@kernel.org> 2023-08-02 17:37:06 +0900
commit84abed36d7de7145d393f9d5d05b36717e0cb49d (patch)
tree47aaf02d0b0bcb0dbcb5353e0bf6f05ec00c11df
parentata: libata: fix parameter type of ata_deadline() (diff)
downloadlinux-84abed36d7de7145d393f9d5d05b36717e0cb49d.tar.gz
linux-84abed36d7de7145d393f9d5d05b36717e0cb49d.tar.bz2
linux-84abed36d7de7145d393f9d5d05b36717e0cb49d.zip
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: Sergey Shtylyov <s.shtylyov@omp.ru> Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
-rw-r--r--drivers/ata/libata-core.c2
-rw-r--r--include/linux/libata.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 04db0f2c683a..54cc342c0b4f 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -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;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index d9edb3d62a42..4772f64af734 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -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,