staging: media: atomisp: Fix various multiline block comment formatting instances
Subsystems (4)
PATCH 1/3 staging: media: atomisp: Fix various multiline block comment formatting instances
This patch makes the following fixes:
* Reformats a number of multiline block comments to ensure * and */ align correctly
--- .../staging/media/atomisp/pci/atomisp_v4l2.c | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +18 -16
@@ -78,13 +78,15 @@ static char firmware_name[256];module_param_string (firmware_name, firmware_name,sizeof (firmware_name),0 );MODULE_PARM_DESC (firmware_name,"Firmware file name. Allows overriding the default firmware name." ); -/*set to 16x16 since this is the amount of lines and pixels the sensor -exports extra. If these are kept at the 10x8 that they were on, in yuv -downscaling modes incorrect resolutions where requested to the sensor -driver with strange outcomes as a result. The proper way tot do this -would be to have a list of tables the specify the sensor res, mipi rec, -output res, and isp output res. however since we do not have this yet, -the chosen solution is the next best thing. */ +/* +* Set to 16x16 since this is the amount of lines and pixels the sensor +* exports extra. If these are kept at the 10x8 that they were on, in yuv +* downscaling modes incorrect resolutions where requested to the sensor +* driver with strange outcomes as a result. The proper way tot do this +* would be to have a list of tables the specify the sensor res, mipi rec, +* output res, and isp output res. however since we do not have this yet, +* the chosen solution is the next best thing. +*/ int pad_w =16 ;module_param (pad_w, int,0644 );MODULE_PARM_DESC (pad_w,"extra data for ISP processing" );
@@ -507,12 +509,12 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) } done:/* -* MRFLD WORKAROUND: -* before powering off IUNIT, clear the pending interrupts -* and disable the interrupt. driver should avoid writing 0 -* to IIR. It could block subsequent interrupt messages. -* HW sighting:4568410. -*/ +* MRFLD WORKAROUND: +* before powering off IUNIT, clear the pending interrupts +* and disable the interrupt. driver should avoid writing 0 +* to IIR. It could block subsequent interrupt messages. +* HW sighting:4568410. +*/ pci_read_config_dword (pdev,PCI_INTERRUPT_CTRL , &irq); irq &= ~BIT (INTR_IER );pci_write_config_dword (pdev,PCI_INTERRUPT_CTRL , irq);
@@ -525,9 +527,9 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) }/* -* WA for DDR DVFS enable/disable -* By default, ISP will force DDR DVFS 1600MHz before disable DVFS -*/ +* WA for DDR DVFS enable/disable +* By default, ISP will force DDR DVFS 1600MHz before disable DVFS +*/ static void punit_ddr_dvfs_enable (bool enable) {int reg;
Signature · 1 line
2.40.1
PATCH 2/3 staging: media: atomisp: Remove extra whitespace after opening parentheses
This patch makes the following changes:
* Removes spurious whitespace after the opening parentheses as per code style guidelines
--- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +2 -2
@@ -1357,7 +1357,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i pdev->d3cold_delay =0 ;break ;case ATOMISP_PCI_DEVICE_SOC_ANN : - isp->media_dev.hw_revision = (ATOMISP_HW_REVISION_ISP2401 + isp->media_dev.hw_revision = (ATOMISP_HW_REVISION_ISP2401 <<ATOMISP_HW_REVISION_SHIFT ); isp->media_dev.hw_revision |= pdev->revision <2 ?ATOMISP_HW_STEPPING_A0 :ATOMISP_HW_STEPPING_B0 ;
@@ -1365,7 +1365,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i isp->hpll_freq =HPLL_FREQ_1600MHZ ;break ;case ATOMISP_PCI_DEVICE_SOC_CHT : - isp->media_dev.hw_revision = (ATOMISP_HW_REVISION_ISP2401 + isp->media_dev.hw_revision = (ATOMISP_HW_REVISION_ISP2401 <<ATOMISP_HW_REVISION_SHIFT ); isp->media_dev.hw_revision |= pdev->revision <2 ?ATOMISP_HW_STEPPING_A0 :ATOMISP_HW_STEPPING_B0 ;
Signature · 1 line
2.40.1
PATCH 3/3 staging: media: atomisp: Replace msleep call for less than 20ms with usleep_range
In reply to Jonathan BerghThis patch makes the following change:
* Replaces the call the msleep() to usleep_range() where msleep was used for a delay less than 20ms.
--- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/media/atomisp/pci/atomisp_v4l2.c +1 -1
@@ -594,7 +594,7 @@ static int atomisp_mrfld_power(struct atomisp_device *isp, bool enable) }while (1 );if (enable) -msleep (10 ); +usleep_range (10000 ,15000 );dev_err (isp->dev,"IUNIT power-%s timeout.\n" , enable ?"on" :"off" );return -EBUSY ;
Signature · 1 line
2.40.1
Hi Jonathan,
Quoted 5 lines · Jonathan Bergh
This patch makes the following fixes:
* Reformats a number of multiline block comments to ensure * and */ align correctlySigned-off-by Jonathan Bergh <[email protected]>
Thank you for your patch.
I have merged patches 1-2 of this series, as well as your previous 2 separate patches and your previous 6 patch patch-series into my media-atomisp branch:
https://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git/log/?h=media-atomisp
And these patches will be included in my next pull-request to Mauro (to media subsystem maintainer)
I did not merge patch 3/3 of this series since the msleep which is being modified there has been removed in the latest version of the code.
Regards,
Hans
Quoted 63 lines
--- .../staging/media/atomisp/pci/atomisp_v4l2.c | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-)drivers/staging/media/atomisp/pci/atomisp_v4l2.c +18
-16@@ -78,13 +78,15 @@ static char firmware_name[256];module_param_string (firmware_name, firmware_name,sizeof (firmware_name),0 );MODULE_PARM_DESC (firmware_name,"Firmware file name. Allows overriding the default firmware name." ); -/*set to 16x16 since this is the amount of lines and pixels the sensor -exports extra. If these are kept at the 10x8 that they were on, in yuv -downscaling modes incorrect resolutions where requested to the sensor -driver with strange outcomes as a result. The proper way tot do this -would be to have a list of tables the specify the sensor res, mipi rec, -output res, and isp output res. however since we do not have this yet, -the chosen solution is the next best thing. */ +/* +* Set to 16x16 since this is the amount of lines and pixels the sensor +* exports extra. If these are kept at the 10x8 that they were on, in yuv +* downscaling modes incorrect resolutions where requested to the sensor +* driver with strange outcomes as a result. The proper way tot do this +* would be to have a list of tables the specify the sensor res, mipi rec, +* output res, and isp output res. however since we do not have this yet, +* the chosen solution is the next best thing. +*/ int pad_w =16 ;module_param (pad_w, int,0644 );MODULE_PARM_DESC (pad_w,"extra data for ISP processing" );@@ -507,12 +509,12 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) } done:/* -* MRFLD WORKAROUND: -* before powering off IUNIT, clear the pending interrupts -* and disable the interrupt. driver should avoid writing 0 -* to IIR. It could block subsequent interrupt messages. -* HW sighting:4568410. -*/ +* MRFLD WORKAROUND: +* before powering off IUNIT, clear the pending interrupts +* and disable the interrupt. driver should avoid writing 0 +* to IIR. It could block subsequent interrupt messages. +* HW sighting:4568410. +*/ pci_read_config_dword (pdev,PCI_INTERRUPT_CTRL , &irq); irq &= ~BIT (INTR_IER );pci_write_config_dword (pdev,PCI_INTERRUPT_CTRL , irq);@@ -525,9 +527,9 @@ static int atomisp_mrfld_pre_power_down(struct atomisp_device *isp) }/* -* WA for DDR DVFS enable/disable -* By default, ISP will force DDR DVFS 1600MHz before disable DVFS -*/ +* WA for DDR DVFS enable/disable +* By default, ISP will force DDR DVFS 1600MHz before disable DVFS +*/ static void punit_ddr_dvfs_enable (bool enable) {int reg;