diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-22 14:27:31 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-22 14:27:31 -0400 |
| commit | 69b307a48a5e10d5fd53dbbfae1c700da356bd5d (patch) | |
| tree | 0a09cc42b3a592d19e5229a84c93f2b58f8c89d3 /drivers/bluetooth | |
| parent | 24de851b79a414f0e1813eb131a7d90849cc22c2 (diff) | |
| parent | 2dea632f9acad076370fe871d4ccc93868621403 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth')
| -rw-r--r-- | drivers/bluetooth/btmrvl_debugfs.c | 6 | ||||
| -rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c index db2c3c305df8..023d35e3c7a7 100644 --- a/drivers/bluetooth/btmrvl_debugfs.c +++ b/drivers/bluetooth/btmrvl_debugfs.c | |||
| @@ -43,7 +43,7 @@ static ssize_t btmrvl_hscfgcmd_write(struct file *file, | |||
| 43 | if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) | 43 | if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) |
| 44 | return -EFAULT; | 44 | return -EFAULT; |
| 45 | 45 | ||
| 46 | ret = strict_strtol(buf, 10, &result); | 46 | ret = kstrtol(buf, 10, &result); |
| 47 | if (ret) | 47 | if (ret) |
| 48 | return ret; | 48 | return ret; |
| 49 | 49 | ||
| @@ -89,7 +89,7 @@ static ssize_t btmrvl_pscmd_write(struct file *file, const char __user *ubuf, | |||
| 89 | if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) | 89 | if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) |
| 90 | return -EFAULT; | 90 | return -EFAULT; |
| 91 | 91 | ||
| 92 | ret = strict_strtol(buf, 10, &result); | 92 | ret = kstrtol(buf, 10, &result); |
| 93 | if (ret) | 93 | if (ret) |
| 94 | return ret; | 94 | return ret; |
| 95 | 95 | ||
| @@ -135,7 +135,7 @@ static ssize_t btmrvl_hscmd_write(struct file *file, const char __user *ubuf, | |||
| 135 | if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) | 135 | if (copy_from_user(&buf, ubuf, min_t(size_t, sizeof(buf) - 1, count))) |
| 136 | return -EFAULT; | 136 | return -EFAULT; |
| 137 | 137 | ||
| 138 | ret = strict_strtol(buf, 10, &result); | 138 | ret = kstrtol(buf, 10, &result); |
| 139 | if (ret) | 139 | if (ret) |
| 140 | return ret; | 140 | return ret; |
| 141 | 141 | ||
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 75c262694632..00da6df9f71e 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c | |||
| @@ -486,7 +486,7 @@ static int btmrvl_sdio_download_fw_w_helper(struct btmrvl_sdio_card *card) | |||
| 486 | if (firmwarelen - offset < txlen) | 486 | if (firmwarelen - offset < txlen) |
| 487 | txlen = firmwarelen - offset; | 487 | txlen = firmwarelen - offset; |
| 488 | 488 | ||
| 489 | tx_blocks = (txlen + blksz_dl - 1) / blksz_dl; | 489 | tx_blocks = DIV_ROUND_UP(txlen, blksz_dl); |
| 490 | 490 | ||
| 491 | memcpy(fwbuf, &firmware[offset], txlen); | 491 | memcpy(fwbuf, &firmware[offset], txlen); |
| 492 | } | 492 | } |
| @@ -873,7 +873,7 @@ static int btmrvl_sdio_host_to_card(struct btmrvl_private *priv, | |||
| 873 | } | 873 | } |
| 874 | 874 | ||
| 875 | blksz = SDIO_BLOCK_SIZE; | 875 | blksz = SDIO_BLOCK_SIZE; |
| 876 | buf_block_len = (nb + blksz - 1) / blksz; | 876 | buf_block_len = DIV_ROUND_UP(nb, blksz); |
| 877 | 877 | ||
| 878 | sdio_claim_host(card->func); | 878 | sdio_claim_host(card->func); |
| 879 | 879 | ||