scsi: qlogicpti: Use of_node_name_eq for node name comparisons
PATCH 1/1 scsi: qlogicpti: Use of_node_name_eq for node name comparisons
Convert string compares of DT node names to use of_node_name_eq helper instead. This removes direct access to the node name pointer.
As prom_name is not used for anything else, remove it.
Cc "James E.J. Bottomley" <[email protected]>
Cc "Martin K. Petersen" <[email protected]>
Signed-off-by Rob Herring <[email protected]>
--- drivers/scsi/qlogicpti.c | 3 +-- drivers/scsi/qlogicpti.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/qlogicpti.c +1 -2
@@ -1314,8 +1314,7 @@ static int qpti_sbus_probe(struct platform_device *op) qpti->qhost = host; qpti->op = op; qpti->qpti_id = nqptis; -strcpy (qpti->prom_name, op->dev.of_node->name); - qpti->is_pti =strcmp (qpti->prom_name,"QLGC,isp" ); + qpti->is_pti = !of_node_name_eq (op->dev.of_node,"QLGC,isp" );if (qpti_map_regs (qpti) <0 ) goto fail_unlink;
drivers/scsi/qlogicpti.h +1 -2
@@ -364,7 +364,6 @@ struct qlogicpti {int qpti_id;int scsi_id;int prom_node; -char prom_name[64 ];int irq;char differential, ultra, clock;unsigned char bursts;
@@ -379,7 +378,7 @@ struct qlogicpti {#define SREG_IMASK 0x0c/* Interrupt level */ #define SREG_SPMASK 0x03/* Mask for switch pack */ unsigned char swsreg; -unsigned int +unsigned int gotirq : 1, /* this instance got an irq */ is_pti : 1; /* Non-zero if this is a PTI board. */ };
Signature · 1 line
2.19.1
Rob,
drivers/scsi/qlogicpti.c static int qpti_sbus_probe(struct platform_device *op) · line 1317
Quoted 2 lines
drivers/scsi/qlogicpti.c +1
-1- qpti->is_pti =strcmp (qpti->prom_name,"QLGC,isp" ); + qpti->is_pti = !of_node_name_eq (op->dev.of_node,"QLGC,isp" );
The apparent polarity inversion made me blink but it appears to be correct (is_pti is set if it's not an isp controller). Makes me wonder if the driver is doing the right thing for a "SUNW,isp", though...
Meelis: Do you have anything that identifies itself as SUNW,isp?
In any case: Applied to 5.1/scsi-queue.
Signature · 1 line
Martin K. Petersen Oracle Linux Engineering