2010-01-17 15:11:18

by Roel Kluin

Subject: [PATCH] lpfc: two branches the same in lpfc_decode_firmware_rev()

Regardless of the flag state, the branches execute the same code

Signed-off-by: Roel Kluin <[email protected]>
---
drivers/scsi/lpfc/lpfc_ct.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 0ebcd9b..bf7bf62 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1843,12 +1843,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag)
c = (rev & 0x0000ff00) >> 8;
b4 = (rev & 0x000000ff);

- if (flag)
- sprintf(fwrevision, "%d.%d%d%c%d ", b1,
- b2, b3, c, b4);
- else
- sprintf(fwrevision, "%d.%d%d%c%d ", b1,
- b2, b3, c, b4);
+ sprintf(fwrevision, "%d.%d%d%c%d", b1, b2, b3, c, b4);
}
return;
}

2010-01-19 22:40:53

by James Smart

Subject: Re: [PATCH] lpfc: two branches the same in lpfc_decode_firmware_rev()

Acked-by: James Smart <[email protected]>

-- james s


Roel Kluin wrote:
> Regardless of the flag state, the branches execute the same code
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_ct.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
> index 0ebcd9b..bf7bf62 100644
> --- a/drivers/scsi/lpfc/lpfc_ct.c
> +++ b/drivers/scsi/lpfc/lpfc_ct.c
> @@ -1843,12 +1843,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag)
> c = (rev & 0x0000ff00) >> 8;
> b4 = (rev & 0x000000ff);
>
> - if (flag)
> - sprintf(fwrevision, "%d.%d%d%c%d ", b1,
> - b2, b3, c, b4);
> - else
> - sprintf(fwrevision, "%d.%d%d%c%d ", b1,
> - b2, b3, c, b4);
> + sprintf(fwrevision, "%d.%d%d%c%d", b1, b2, b3, c, b4);
> }
> return;
> }
>
>

2010-01-19 22:41:29

by James Smart

Subject: Re: [PATCH] lpfc: two branches the same in lpfc_decode_firmware_rev()

Acked-by: James Smart <[email protected]>

-- james s



Roel Kluin wrote:
> Regardless of the flag state, the branches execute the same code
>
> Signed-off-by: Roel Kluin <[email protected]>
> ---
> drivers/scsi/lpfc/lpfc_ct.c | 7 +------
> 1 files changed, 1 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
> index 0ebcd9b..bf7bf62 100644
> --- a/drivers/scsi/lpfc/lpfc_ct.c
> +++ b/drivers/scsi/lpfc/lpfc_ct.c
> @@ -1843,12 +1843,7 @@ lpfc_decode_firmware_rev(struct lpfc_hba *phba, char *fwrevision, int flag)
> c = (rev & 0x0000ff00) >> 8;
> b4 = (rev & 0x000000ff);
>
> - if (flag)
> - sprintf(fwrevision, "%d.%d%d%c%d ", b1,
> - b2, b3, c, b4);
> - else
> - sprintf(fwrevision, "%d.%d%d%c%d ", b1,
> - b2, b3, c, b4);
> + sprintf(fwrevision, "%d.%d%d%c%d", b1, b2, b3, c, b4);
> }
> return;
> }
>