The semicolon after the `}' in line 1152 is unneeded.
Signed-off-by: Jason Wang <[email protected]>
---
drivers/scsi/qlogicpti.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index 57f2f4135a06..4f777ca9730b 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -513,7 +513,7 @@ static int qlogicpti_load_firmware(struct qlogicpti *qpti)
qpti->qpti_id);
err = 1;
goto out;
- }
+ }
sbus_writew(SBUS_CTRL_RESET, qpti->qregs + SBUS_CTRL);
sbus_writew((DMA_CTRL_CCLEAR | DMA_CTRL_CIRQ), qpti->qregs + CMD_DMA_CTRL);
sbus_writew((DMA_CTRL_CCLEAR | DMA_CTRL_CIRQ), qpti->qregs + DATA_DMA_CTRL);
@@ -563,7 +563,7 @@ static int qlogicpti_load_firmware(struct qlogicpti *qpti)
qpti->qpti_id);
err = 1;
goto out;
- }
+ }
/* Load it up.. */
for (i = 0; i < risc_code_length; i++) {
@@ -1135,7 +1135,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
if (!(sbus_readw(qpti->qregs + SBUS_STAT) & SBUS_STAT_RINT))
return NULL;
-
+
in_ptr = sbus_readw(qpti->qregs + MBOX5);
sbus_writew(HCCTRL_CRIRQ, qpti->qregs + HCCTRL);
if (sbus_readw(qpti->qregs + SBUS_SEMAPHORE) & SBUS_SEMAPHORE_LCK) {
@@ -1149,7 +1149,7 @@ static struct scsi_cmnd *qlogicpti_intr_handler(struct qlogicpti *qpti)
case COMMAND_ERROR:
case COMMAND_PARAM_ERROR:
break;
- };
+ }
sbus_writew(0, qpti->qregs + SBUS_SEMAPHORE);
}
@@ -1363,7 +1363,7 @@ static int qpti_sbus_probe(struct platform_device *op)
printk("(FCode %s)", fcode);
if (of_find_property(dp, "differential", NULL) != NULL)
qpti->differential = 1;
-
+
printk("\nqlogicpti%d: [%s Wide, using %s interface]\n",
qpti->qpti_id,
(qpti->ultra ? "Ultra" : "Fast"),
--
2.35.1
On sabato 16 luglio 2022 20:38:43 CEST Jason Wang wrote:
> The semicolon after the `}' in line 1152 is unneeded.
>
> Signed-off-by: Jason Wang <[email protected]>
> ---
> drivers/scsi/qlogicpti.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
> index 57f2f4135a06..4f777ca9730b 100644
> --- a/drivers/scsi/qlogicpti.c
> +++ b/drivers/scsi/qlogicpti.c
> @@ -513,7 +513,7 @@ static int qlogicpti_load_firmware(struct qlogicpti
*qpti)
> qpti->qpti_id);
> err = 1;
> goto out;
> - }
> + }
Why did you delete and then put back braces?
> sbus_writew(SBUS_CTRL_RESET, qpti->qregs + SBUS_CTRL);
> sbus_writew((DMA_CTRL_CCLEAR | DMA_CTRL_CIRQ), qpti->qregs +
CMD_DMA_CTRL);
> sbus_writew((DMA_CTRL_CCLEAR | DMA_CTRL_CIRQ), qpti->qregs +
DATA_DMA_CTRL);
> @@ -563,7 +563,7 @@ static int qlogicpti_load_firmware(struct qlogicpti
*qpti)
> qpti->qpti_id);
> err = 1;
> goto out;
> - }
> + }
Same question.
> /* Load it up.. */
> for (i = 0; i < risc_code_length; i++) {
> @@ -1135,7 +1135,7 @@ static struct scsi_cmnd
*qlogicpti_intr_handler(struct qlogicpti *qpti)
>
> if (!(sbus_readw(qpti->qregs + SBUS_STAT) & SBUS_STAT_RINT))
> return NULL;
> -
> +
Why did you delete and then put back an empty line?
> in_ptr = sbus_readw(qpti->qregs + MBOX5);
> sbus_writew(HCCTRL_CRIRQ, qpti->qregs + HCCTRL);
> if (sbus_readw(qpti->qregs + SBUS_SEMAPHORE) &
SBUS_SEMAPHORE_LCK) {
> @@ -1149,7 +1149,7 @@ static struct scsi_cmnd
*qlogicpti_intr_handler(struct qlogicpti *qpti)
> case COMMAND_ERROR:
> case COMMAND_PARAM_ERROR:
> break;
> - };
> + }
> sbus_writew(0, qpti->qregs + SBUS_SEMAPHORE);
> }
>
> @@ -1363,7 +1363,7 @@ static int qpti_sbus_probe(struct platform_device
*op)
> printk("(FCode %s)", fcode);
> if (of_find_property(dp, "differential", NULL) != NULL)
> qpti->differential = 1;
> -
> +
Again :-)
> printk("\nqlogicpti%d: [%s Wide, using %s interface]\n",
> qpti->qpti_id,
> (qpti->ultra ? "Ultra" : "Fast"),
> --
> 2.35.1
>
>
I guess that things went the following way (please check yourself):
1) You made a patch with some mistakes (i.e., deleted _necessary_ braces
and lines).
2) You realized your own mistakes.
3) You made a second patch on your first patch (because you forgot to git-
reset the first version - you probably now see two patches with git-log).
4) You didn't look at git-diff before committing and sending.
If so, please notice that this is not the right way to fix mistakes.
Maintainers don't want to see that, for instance, you deleted a line and
then you put it back. Patches must show only net changes, not the entire
story of trial, errors, fixes.
Please learn and use Git properly. I'd suggest you to work on drivers/
staging, otherwise you may risk that patches coming from your address
become ignored by Maintainers and other developers working in more mature
parts of Linux (this means everywhere but drivers/staging).
Thanks,
Fabio