Patch 1 of 1
hpsa: a pci device ID is defined twice
From: Mike Miller <[email protected]>
PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as 3fff in
hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It is
intended only as part a complete storage solution. As such, this patch
removes the redefinition and the StorageWorks P1210m from the product table.
It also removes a duplicate line for the "unknown" controller support.
---
drivers/scsi/hpsa.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index b2fb2b2..a6dea08 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -90,11 +90,7 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3252},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3253},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3254},
-#define PCI_DEVICE_ID_HP_CISSF 0x333f
- {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x333F},
- {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
- {PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+ {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
{0,}
};
@@ -113,8 +109,6 @@ static struct board_type products[] = {
{0x3249103C, "Smart Array P812", &SA5_access},
{0x324a103C, "Smart Array P712m", &SA5_access},
{0x324b103C, "Smart Array P711m", &SA5_access},
- {0x3233103C, "StorageWorks P1210m", &SA5_access},
- {0x333F103C, "StorageWorks P1210m", &SA5_access},
{0x3250103C, "Smart Array", &SA5_access},
{0x3250113C, "Smart Array", &SA5_access},
{0x3250123C, "Smart Array", &SA5_access},
> -----Original Message-----
> From: Andrew Morton [mailto:[email protected]]
> Sent: Wednesday, December 01, 2010 4:48 PM
> To: Miller, Mike (OS Dev)
> Cc: James E. J. Bottomley; LKML; LKML-scsi; hplk
> Subject: Re: [PATCH 1/1] hpsa: fix redefinition of PCI_DEVICE_ID_CISSF
>
> On Wed, 1 Dec 2010 11:16:07 -0600
> Mike Miller <[email protected]> wrote:
>
> > hpsa: a pci device ID is defined twice
> >
> > From: Mike Miller <[email protected]>
> >
> > PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as
> 3fff in
> > hpsa.c. The ID of 3fff will _never_ ship as a standalone controller.
> It is
> > intended only as part a complete storage solution. As such, this
> patch
> > removes the redefinition and the StorageWorks P1210m from the product
> table.
> >
> > It also removes a duplicate line for the "unknown" controller
> support.
>
> It is missing a signed-off-by:, and please quote the warning message
> when fixing warnings.
Sorry about that. I guess I expected stg to do that.
>
> Also, this patch fixes a bug, doesn't it? 323b controllers simply
> won't work?
That's correct.
-- mikem
>
> James, it's needed in .37 please.
>
>
> From: Mike Miller <[email protected]>
>
> drivers/scsi/hpsa.c:93:1: warning: "PCI_DEVICE_ID_HP_CISSF" redefined
> In file included from include/linux/pci.h:58,
> from drivers/scsi/hpsa.c:25:
> include/linux/pci_ids.h:746:1: warning: this is the location of the
> previous definition
>
> PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as
> 3fff in
> hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It
> is
> intended only as part a complete storage solution. As such, this patch
> removes the redefinition and the StorageWorks P1210m from the product
> table.
>
> It also removes a duplicate line for the "unknown" controller support.
>
> Signed-off-by: Mike Miller <[email protected]>
> Cc: James Bottomley <[email protected]>
> Signed-off-by: Andrew Morton <[email protected]>
> ---
>
> drivers/scsi/hpsa.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff -puN drivers/scsi/hpsa.c~hpsa-fix-redefinition-of-
> pci_device_id_cissf drivers/scsi/hpsa.c
> --- a/drivers/scsi/hpsa.c~hpsa-fix-redefinition-of-pci_device_id_cissf
> +++ a/drivers/scsi/hpsa.c
> @@ -90,11 +90,7 @@ static const struct pci_device_id hpsa_p
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C,
> 0x3252},
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C,
> 0x3253},
> {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C,
> 0x3254},
> -#define PCI_DEVICE_ID_HP_CISSF 0x333f
> - {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C,
> 0x333F},
> - {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID,
> PCI_ANY_ID,
> - PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
> - {PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID,
> PCI_ANY_ID,
> + {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
> PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
> {0,}
> };
> @@ -113,8 +109,6 @@ static struct board_type products[] = {
> {0x3249103C, "Smart Array P812", &SA5_access},
> {0x324a103C, "Smart Array P712m", &SA5_access},
> {0x324b103C, "Smart Array P711m", &SA5_access},
> - {0x3233103C, "StorageWorks P1210m", &SA5_access},
> - {0x333F103C, "StorageWorks P1210m", &SA5_access},
> {0x3250103C, "Smart Array", &SA5_access},
> {0x3250113C, "Smart Array", &SA5_access},
> {0x3250123C, "Smart Array", &SA5_access},
> _
On Wed, 1 Dec 2010 11:16:07 -0600
Mike Miller <[email protected]> wrote:
> hpsa: a pci device ID is defined twice
>
> From: Mike Miller <[email protected]>
>
> PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as 3fff in
> hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It is
> intended only as part a complete storage solution. As such, this patch
> removes the redefinition and the StorageWorks P1210m from the product table.
>
> It also removes a duplicate line for the "unknown" controller support.
It is missing a signed-off-by:, and please quote the warning message
when fixing warnings.
Also, this patch fixes a bug, doesn't it? 323b controllers simply
won't work?
James, it's needed in .37 please.
From: Mike Miller <[email protected]>
drivers/scsi/hpsa.c:93:1: warning: "PCI_DEVICE_ID_HP_CISSF" redefined
In file included from include/linux/pci.h:58,
from drivers/scsi/hpsa.c:25:
include/linux/pci_ids.h:746:1: warning: this is the location of the previous definition
PCI_DEVICE_ID_CISSF is defined as 323b in pci_ids.h but redefined as 3fff in
hpsa.c. The ID of 3fff will _never_ ship as a standalone controller. It is
intended only as part a complete storage solution. As such, this patch
removes the redefinition and the StorageWorks P1210m from the product table.
It also removes a duplicate line for the "unknown" controller support.
Signed-off-by: Mike Miller <[email protected]>
Cc: James Bottomley <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
---
drivers/scsi/hpsa.c | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff -puN drivers/scsi/hpsa.c~hpsa-fix-redefinition-of-pci_device_id_cissf drivers/scsi/hpsa.c
--- a/drivers/scsi/hpsa.c~hpsa-fix-redefinition-of-pci_device_id_cissf
+++ a/drivers/scsi/hpsa.c
@@ -90,11 +90,7 @@ static const struct pci_device_id hpsa_p
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3252},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3253},
{PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSE, 0x103C, 0x3254},
-#define PCI_DEVICE_ID_HP_CISSF 0x333f
- {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSF, 0x103C, 0x333F},
- {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
- PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
- {PCI_VENDOR_ID_COMPAQ, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+ {PCI_VENDOR_ID_HP, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
{0,}
};
@@ -113,8 +109,6 @@ static struct board_type products[] = {
{0x3249103C, "Smart Array P812", &SA5_access},
{0x324a103C, "Smart Array P712m", &SA5_access},
{0x324b103C, "Smart Array P711m", &SA5_access},
- {0x3233103C, "StorageWorks P1210m", &SA5_access},
- {0x333F103C, "StorageWorks P1210m", &SA5_access},
{0x3250103C, "Smart Array", &SA5_access},
{0x3250113C, "Smart Array", &SA5_access},
{0x3250123C, "Smart Array", &SA5_access},
_