X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fscsi%2Fipr.c;h=fe6029f4df164406e406fb8ca6b2c698461fd48a;hb=5f3d2f2e1a63679cf1c4a4210f2f1cc2f335bef6;hp=e3f29f61cbc3910f7dec04e8fdc702b3077e1454;hpb=283dbd82055eb70ff3b469f812d9c695f18c9641;p=karo-tx-linux.git diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index e3f29f61cbc3..fe6029f4df16 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -6373,14 +6373,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 }; /** @@ -6400,7 +6400,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; } }