Message ID | 20240508010431.25687-1-kiran.k@intel.com |
---|---|
State | Superseded |
Headers | show |
Series | [v1] Bluetooth: btintel_pcie: Fix compiler warnings | expand |
Dear Kiran, Thank you for your patch. Am 08.05.24 um 03:04 schrieb Kiran K: > Fix compiler warnings reported by kernel bot. It’d be great, if you added the warnings: >> drivers/bluetooth/btintel_pcie.c:184:6: warning: variable 'reg' set but not used [-Wunused-but-set-variable] u32 reg; ^ >> drivers/bluetooth/btintel_pcie.c:192:26: warning: shift count >= width of type [-Wshift-count-overflow] data->ci_p_addr >> 32); ^ ~~ >> drivers/bluetooth/btintel_pcie.c:458:15: warning: variable 'frbd' set but not used [-Wunused-but-set-variable] struct frbd *frbd; ^ 3 warnings generated. > Reported-by: kernel test robot <lkp@intel.com> > Closes: https://lore.kernel.org/oe-kbuild-all/202405080647.VRBej6fA-lkp@intel.com/ > Signed-off-by: Kiran K <kiran.k@intel.com> Please add a Fixes: tag. (I personally would also prefer one commit per warning.) Kind regards, Paul > --- > drivers/bluetooth/btintel_pcie.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c > index e9bc4b673424..2853ab80079d 100644 > --- a/drivers/bluetooth/btintel_pcie.c > +++ b/drivers/bluetooth/btintel_pcie.c > @@ -251,7 +251,6 @@ static void btintel_pcie_reset_bt(struct btintel_pcie_data *data) > static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) > { > int err; > - u32 reg; > > data->gp0_received = false; > > @@ -259,7 +258,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) > btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_LSB_REG, > data->ci_p_addr & 0xffffffff); > btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_MSB_REG, > - data->ci_p_addr >> 32); > + (u64)data->ci_p_addr >> 32); > > /* Reset the cached value of boot stage. it is updated by the MSI-X > * gp0 interrupt handler. > @@ -267,7 +266,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) > data->boot_stage_cache = 0x0; > > /* Set MAC_INIT bit to start primary bootloader */ > - reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); > + btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); > > btintel_pcie_set_reg_bits(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG, > BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_INIT); > @@ -285,7 +284,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) > BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_ENA | > BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_INIT); > > - reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); > + btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); > > /* wait for interrupt from the device after booting up to primary > * bootloader. > @@ -525,7 +524,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data) > u16 cr_hia, cr_tia; > struct rxq *rxq; > struct urbd1 *urbd1; > - struct frbd *frbd; > struct data_buf *buf; > int ret; > struct hci_dev *hdev = data->hdev; > @@ -550,8 +548,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data) > urbd1 = &rxq->urbd1s[cr_tia]; > ipc_print_urbd1(data->hdev, urbd1, cr_tia); > > - frbd = &rxq->frbds[urbd1->frbd_tag]; > - > buf = &rxq->bufs[urbd1->frbd_tag]; > if (!buf) { > bt_dev_err(hdev, "RXQ: failed to get the DMA buffer for %d",
diff --git a/drivers/bluetooth/btintel_pcie.c b/drivers/bluetooth/btintel_pcie.c index e9bc4b673424..2853ab80079d 100644 --- a/drivers/bluetooth/btintel_pcie.c +++ b/drivers/bluetooth/btintel_pcie.c @@ -251,7 +251,6 @@ static void btintel_pcie_reset_bt(struct btintel_pcie_data *data) static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) { int err; - u32 reg; data->gp0_received = false; @@ -259,7 +258,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_LSB_REG, data->ci_p_addr & 0xffffffff); btintel_pcie_wr_reg32(data, BTINTEL_PCIE_CSR_CI_ADDR_MSB_REG, - data->ci_p_addr >> 32); + (u64)data->ci_p_addr >> 32); /* Reset the cached value of boot stage. it is updated by the MSI-X * gp0 interrupt handler. @@ -267,7 +266,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) data->boot_stage_cache = 0x0; /* Set MAC_INIT bit to start primary bootloader */ - reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); + btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); btintel_pcie_set_reg_bits(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG, BTINTEL_PCIE_CSR_FUNC_CTRL_MAC_INIT); @@ -285,7 +284,7 @@ static int btintel_pcie_enable_bt(struct btintel_pcie_data *data) BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_ENA | BTINTEL_PCIE_CSR_FUNC_CTRL_FUNC_INIT); - reg = btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); + btintel_pcie_rd_reg32(data, BTINTEL_PCIE_CSR_FUNC_CTRL_REG); /* wait for interrupt from the device after booting up to primary * bootloader. @@ -525,7 +524,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data) u16 cr_hia, cr_tia; struct rxq *rxq; struct urbd1 *urbd1; - struct frbd *frbd; struct data_buf *buf; int ret; struct hci_dev *hdev = data->hdev; @@ -550,8 +548,6 @@ static void btintel_pcie_msix_rx_handle(struct btintel_pcie_data *data) urbd1 = &rxq->urbd1s[cr_tia]; ipc_print_urbd1(data->hdev, urbd1, cr_tia); - frbd = &rxq->frbds[urbd1->frbd_tag]; - buf = &rxq->bufs[urbd1->frbd_tag]; if (!buf) { bt_dev_err(hdev, "RXQ: failed to get the DMA buffer for %d",
Fix compiler warnings reported by kernel bot. Reported-by: kernel test robot <lkp@intel.com> Closes: https://lore.kernel.org/oe-kbuild-all/202405080647.VRBej6fA-lkp@intel.com/ Signed-off-by: Kiran K <kiran.k@intel.com> --- drivers/bluetooth/btintel_pcie.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)