From patchwork Wed Dec 5 19:50:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 152960 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp9696514ljp; Wed, 5 Dec 2018 11:52:37 -0800 (PST) X-Google-Smtp-Source: AFSGD/UuV6jq7KRADbEoIVKOPhU0AsngKcE4F4CrxuJobq/eHloZjOZUBD2Q24yDbM8p8T2gBveA X-Received: by 2002:a63:a002:: with SMTP id r2mr21254950pge.212.1544039557083; Wed, 05 Dec 2018 11:52:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544039557; cv=none; d=google.com; s=arc-20160816; b=rAxhIPBZM4jRx73mOwurGF1pEgz5KD9BQtQ5ZUZKy05LOZX2KA3+N5OH8zSrtRUoXI jFNz9wNq5iSwAZDU7e8xvS5CPDWEvv46u9xYCVbhuriXvZhl3sjKsFuLPCB8CbQuEXiH suxjhL+uGZQa6ykEcwsVzc0vgCfh2GB6xiKAFDNTVaE5Uh/gmUDejpCftDXsXB22Prx8 AhjrhumdrHEUKaXzOgw6rCBRHPn310v8MooprDFL4IbwU359mxIbbsebojhdVaIS9+NK GRRtThHGwlVjfRLLK0BmlHVZHL474jjLEfzlWUUQjmsZj0h6Jh1Q/IZShb0+MOH7wi1n 8Ogg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:to:from; bh=emH1g9Exn0OVhGYnu7c/NjHtAOZPINdJqKI6tPl+TjQ=; b=TSRtI8r+7hUqdKFsaZr/z05LlnKJxwLY23tmDpBvzeSzLJQcs9o17wN7tIKNnTJWO7 ykSRHGwrnY6U6knazfTbiYa3VBT6GZY25sSCqQEqF8ittRaBOI7PQWdnO7+H+ByWKOnB RljlZ0j2U8KxWyvOSbtHSHAsX/E0Tq3QfrcqkHX3H4bEMyiVhtZm99TlmE+RgRy6NhPY CQwlqo84duWtzGFjAd5XupEaIpvmAlbw0wj8eJg7P6q6jKlPmhI/Nu1QUYUr3YRBz/2X qlhIDYtoMmvqeQBgTg7EtsSLTsVhII3CSKCzhWHl+KqoBJd+shDlQNANFUPTu005N3ry 8uWQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s36si20485350pld.46.2018.12.05.11.52.36; Wed, 05 Dec 2018 11:52:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728985AbeLETwf (ORCPT + 31 others); Wed, 5 Dec 2018 14:52:35 -0500 Received: from mail-ot1-f67.google.com ([209.85.210.67]:35483 "EHLO mail-ot1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728364AbeLETvT (ORCPT ); Wed, 5 Dec 2018 14:51:19 -0500 Received: by mail-ot1-f67.google.com with SMTP id 81so19834948otj.2; Wed, 05 Dec 2018 11:51:18 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=emH1g9Exn0OVhGYnu7c/NjHtAOZPINdJqKI6tPl+TjQ=; b=YK756hyoWIc3qbjXPo71p+T8ShW3FDgF2fKfReFm0MSwAN4mjXJ51pq9B2VZ/y4cu+ i10x73AD4lJ/tky7dUsqXxn/ux4i+7h41HUctZiY+SouKQWRRM2mU9Jg42OFmUgdwtqR Pe+GA0tBw4+ZeeHdE3bjcdf799kYg5ODe2jp6nIwiG6LQxr3kNW9ykLR0MUIyEqpTCnP clCunUx/ZPOBke8LRAOG7JdDJVyDXbOXTz1/wPodn/FN7WC0Y6u/XqGGsLXqQPJoLqE4 Qm2HAJN8fOxgG/zILUr9rT9qsHTvWVL1x13Oe8R7qrzBTLiXhTokqNqifhCaFWgfWAhn DPyQ== X-Gm-Message-State: AA+aEWYNyn26vyKCLH8Vq3AYU/KQ8tjPch1CYnMs4keXEwLh+XpkTisR IO5W2qOCxQDPZRXHgSaQ+10pdss= X-Received: by 2002:a9d:77d4:: with SMTP id w20mr15762434otl.196.1544039478376; Wed, 05 Dec 2018 11:51:18 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id k13sm25759879otj.19.2018.12.05.11.51.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 05 Dec 2018 11:51:17 -0800 (PST) From: Rob Herring To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] scsi: qlogicpti: Use of_node_name_eq for node name comparisons Date: Wed, 5 Dec 2018 13:50:40 -0600 Message-Id: <20181205195050.4759-24-robh@kernel.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. Signed-off-by: Rob Herring --- drivers/scsi/qlogicpti.c | 3 +-- drivers/scsi/qlogicpti.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) -- 2.19.1 diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 9d09228eee28..4f14963c4270 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c @@ -1315,8 +1315,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 884ad72ade57..2b6374e08a7d 100644 --- 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. */ };