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" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index e35ce76..0e22512 100644 (file)
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -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;

diff --git a/drivers/scsi/qlogicpti.h b/drivers/scsi/qlogicpti.h
index 884ad72..2b6374e 100644 (file)
--- a/drivers/scsi/qlogicpti.h
+++ b/drivers/scsi/qlogicpti.h
@@ -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. */
 };