| Message ID | 20240227163043.112162-1-bergh.jonathan@gmail.com |
|---|---|
| State | Accepted |
| Commit | 8daa7c5cfbb2a3e2372573da4b6d65963645a52a |
| Headers | show |
| Series | [1/3] staging: media: atomisp: Fix various multiline block comment formatting instances | expand |
Hi Jonathan, On 2/27/24 5:30 PM, Jonathan Bergh wrote: > This patch makes the following fixes: > * Reformats a number of multiline block comments to ensure * and */ align > correctly > > Signed-off-by: Jonathan Bergh <bergh.jonathan@gmail.com> 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 > --- > .../staging/media/atomisp/pci/atomisp_v4l2.c | 34 ++++++++++--------- > 1 file changed, 18 insertions(+), 16 deletions(-) > > diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c > index 547e1444ad97..77809e88da83 100644 > --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c > +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c > @@ -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;
diff --git a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c index 547e1444ad97..77809e88da83 100644 --- a/drivers/staging/media/atomisp/pci/atomisp_v4l2.c +++ b/drivers/staging/media/atomisp/pci/atomisp_v4l2.c @@ -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;
This patch makes the following fixes: * Reformats a number of multiline block comments to ensure * and */ align correctly Signed-off-by: Jonathan Bergh <bergh.jonathan@gmail.com> --- .../staging/media/atomisp/pci/atomisp_v4l2.c | 34 ++++++++++--------- 1 file changed, 18 insertions(+), 16 deletions(-)