staging: media: atomisp:Replace a bit shift.
Subsystems (4)
PATCH v2 1/1 staging: media: atomisp:Replace a bit shift.
This patch replaces bit shifting on 1 with the BIT(x) macro. This was done with coccinelle:
@@
constant c;
@@
-1 << c
+BIT(c)
Signed-off-by Arushi Singhal <[email protected]>
---
changes in v2
-remove the unnecessary parenthesis.
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c | 12 ++++++------ drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +6 -6
@@ -194,7 +194,7 @@ static int write_target_freq_to_hw(struct atomisp_device *isp,if (isp_sspm1 &ISP_FREQ_VALID_MASK ) {dev_dbg (isp->dev,"clearing ISPSSPM1 valid bit.\n" );intel_mid_msgbus_write32 (PUNIT_PORT ,ISPSSPM1 , - isp_sspm1 & ~(1 <<ISP_FREQ_VALID_OFFSET )); + isp_sspm1 & ~BIT (ISP_FREQ_VALID_OFFSET )); } ratio = (2 * isp->hpll_freq + new_freq /2 ) / new_freq -1 ;
@@ -207,7 +207,7 @@ static int write_target_freq_to_hw(struct atomisp_device *isp,intel_mid_msgbus_write32 (PUNIT_PORT ,ISPSSPM1 , isp_sspm1 | ratio <<ISP_REQ_FREQ_OFFSET - |1 <<ISP_FREQ_VALID_OFFSET + |BIT (ISP_FREQ_VALID_OFFSET ) | guar_ratio <<ISP_REQ_GUAR_FREQ_OFFSET ); isp_sspm1 =intel_mid_msgbus_read32 (PUNIT_PORT ,ISPSSPM1 );
@@ -417,10 +417,10 @@ void atomisp_msi_irq_init(struct atomisp_device *isp, struct pci_dev *dev)u16 msg16;pci_read_config_dword (dev,PCI_MSI_CAPID , &msg32); - msg32 |=1 <<MSI_ENABLE_BIT ; + msg32 |=BIT (MSI_ENABLE_BIT );pci_write_config_dword (dev,PCI_MSI_CAPID , msg32); - msg32 = (1 <<INTR_IER ) | (1 <<INTR_IIR ); + msg32 =BIT (INTR_IER ) |BIT (INTR_IIR );pci_write_config_dword (dev,PCI_INTERRUPT_CTRL , msg32);pci_read_config_word (dev,PCI_COMMAND , &msg16);
@@ -435,7 +435,7 @@ void atomisp_msi_irq_uninit(struct atomisp_device *isp, struct pci_dev *dev)u16 msg16;pci_read_config_dword (dev,PCI_MSI_CAPID , &msg32); - msg32 &= ~(1 <<MSI_ENABLE_BIT ); + msg32 &= ~BIT (MSI_ENABLE_BIT );pci_write_config_dword (dev,PCI_MSI_CAPID , msg32); msg32 =0x0 ;
@@ -536,7 +536,7 @@ static void clear_irq_reg(struct atomisp_device *isp) {u32 msg_ret;pci_read_config_dword (isp->pdev,PCI_INTERRUPT_CTRL , &msg_ret); - msg_ret |=1 <<INTR_IIR ; + msg_ret |=BIT (INTR_IIR );pci_write_config_dword (isp->pdev,PCI_INTERRUPT_CTRL , msg_ret); }
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +5 -5
@@ -330,11 +330,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)* IRQ, if so, waiting for it to be served */ pci_read_config_dword (dev,PCI_INTERRUPT_CTRL , &irq); - irq = irq &1 <<INTR_IIR ; + irq = irq &BIT (INTR_IIR );pci_write_config_dword (dev,PCI_INTERRUPT_CTRL , irq);pci_read_config_dword (dev,PCI_INTERRUPT_CTRL , &irq); -if (!(irq & (1 <<INTR_IIR ))) +if (!(irq &BIT (INTR_IIR ))) goto done;atomisp_store_uint32 (MRFLD_INTR_CLEAR_REG ,0xFFFFFFFF );
@@ -347,11 +347,11 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)return -EAGAIN ; }else {pci_read_config_dword (dev,PCI_INTERRUPT_CTRL , &irq); - irq = irq &1 <<INTR_IIR ; + irq = irq &BIT (INTR_IIR );pci_write_config_dword (dev,PCI_INTERRUPT_CTRL , irq);pci_read_config_dword (dev,PCI_INTERRUPT_CTRL , &irq); -if (!(irq & (1 <<INTR_IIR ))) { +if (!(irq &BIT (INTR_IIR ))) {atomisp_store_uint32 (MRFLD_INTR_ENABLE_REG ,0x0 ); goto done; }
@@ -370,7 +370,7 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp)* HW sighting:4568410. */ pci_read_config_dword (dev,PCI_INTERRUPT_CTRL , &irq); - irq &= ~(1 <<INTR_IER ); + irq &= ~BIT (INTR_IER );pci_write_config_dword (dev,PCI_INTERRUPT_CTRL , irq);atomisp_msi_irq_uninit (isp, dev);
Signature · 1 line
2.11.0