diff options
Diffstat (limited to 'drivers/spi/spi-bcm53xx.c')
| -rw-r--r-- | drivers/spi/spi-bcm53xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm53xx.c b/drivers/spi/spi-bcm53xx.c index 3fb91c81015a..1520554978a3 100644 --- a/drivers/spi/spi-bcm53xx.c +++ b/drivers/spi/spi-bcm53xx.c | |||
| @@ -44,7 +44,7 @@ static int bcm53xxspi_wait(struct bcm53xxspi *b53spi, unsigned int timeout_ms) | |||
| 44 | u32 tmp; | 44 | u32 tmp; |
| 45 | 45 | ||
| 46 | /* SPE bit has to be 0 before we read MSPI STATUS */ | 46 | /* SPE bit has to be 0 before we read MSPI STATUS */ |
| 47 | deadline = jiffies + BCM53XXSPI_SPE_TIMEOUT_MS * HZ / 1000; | 47 | deadline = jiffies + msecs_to_jiffies(BCM53XXSPI_SPE_TIMEOUT_MS); |
| 48 | do { | 48 | do { |
| 49 | tmp = bcm53xxspi_read(b53spi, B53SPI_MSPI_SPCR2); | 49 | tmp = bcm53xxspi_read(b53spi, B53SPI_MSPI_SPCR2); |
| 50 | if (!(tmp & B53SPI_MSPI_SPCR2_SPE)) | 50 | if (!(tmp & B53SPI_MSPI_SPCR2_SPE)) |
| @@ -56,7 +56,7 @@ static int bcm53xxspi_wait(struct bcm53xxspi *b53spi, unsigned int timeout_ms) | |||
| 56 | goto spi_timeout; | 56 | goto spi_timeout; |
| 57 | 57 | ||
| 58 | /* Check status */ | 58 | /* Check status */ |
| 59 | deadline = jiffies + timeout_ms * HZ / 1000; | 59 | deadline = jiffies + msecs_to_jiffies(timeout_ms); |
| 60 | do { | 60 | do { |
| 61 | tmp = bcm53xxspi_read(b53spi, B53SPI_MSPI_MSPI_STATUS); | 61 | tmp = bcm53xxspi_read(b53spi, B53SPI_MSPI_MSPI_STATUS); |
| 62 | if (tmp & B53SPI_MSPI_MSPI_STATUS_SPIF) { | 62 | if (tmp & B53SPI_MSPI_MSPI_STATUS_SPIF) { |