powerpc: Rename 64-bit PVR constants to PVR_foo
We have an old FIXME in reg.h which points out that we should standardise on PVR_foo for our PVR #defines. Currently we use PVR_ on 32-bit and PV_ on 64-bit. So do that rename and remove the FIXME. Seeing as we're touching all but one usage of __is_processor(), rename it to something less ugly and more indicative of what it does, which is simply to check the PVR version. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:

committed by
Benjamin Herrenschmidt

parent
d1cfc0ce5d
commit
d3dbeef657
@@ -6304,14 +6304,14 @@ static struct ata_port_info sata_port_info = {
|
||||
|
||||
#ifdef CONFIG_PPC_PSERIES
|
||||
static const u16 ipr_blocked_processors[] = {
|
||||
PV_NORTHSTAR,
|
||||
PV_PULSAR,
|
||||
PV_POWER4,
|
||||
PV_ICESTAR,
|
||||
PV_SSTAR,
|
||||
PV_POWER4p,
|
||||
PV_630,
|
||||
PV_630p
|
||||
PVR_NORTHSTAR,
|
||||
PVR_PULSAR,
|
||||
PVR_POWER4,
|
||||
PVR_ICESTAR,
|
||||
PVR_SSTAR,
|
||||
PVR_POWER4p,
|
||||
PVR_630,
|
||||
PVR_630p
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -6331,7 +6331,7 @@ static int ipr_invalid_adapter(struct ipr_ioa_cfg *ioa_cfg)
|
||||
|
||||
if ((ioa_cfg->type == 0x5702) && (ioa_cfg->pdev->revision < 4)) {
|
||||
for (i = 0; i < ARRAY_SIZE(ipr_blocked_processors); i++){
|
||||
if (__is_processor(ipr_blocked_processors[i]))
|
||||
if (pvr_version_is(ipr_blocked_processors[i]))
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user