From patchwork Fri Aug 12 01:34:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1665744 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=R+vvr/23; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4M3mYZ3rB8z9sFs for ; Fri, 12 Aug 2022 11:39:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0EF3D84AF5; Fri, 12 Aug 2022 03:36:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="R+vvr/23"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 00A0B84ABD; Fri, 12 Aug 2022 03:35:48 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-oa1-x30.google.com (mail-oa1-x30.google.com [IPv6:2001:4860:4864:20::30]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B00F284ABE for ; Fri, 12 Aug 2022 03:35:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-10e6bdbe218so23546518fac.10 for ; Thu, 11 Aug 2022 18:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=gc0kiIDwcYX+zF7zj0sEuquIY0xW7+qe2JNMZyafYSs=; b=R+vvr/23zFLAxz83Zcj2u49tgGvyciryNY9qgMtt3y+DDBWV4aY2RrWCZlbhWHpara b3FoWsAD+nXS+nl43jUPnq3KVLw203o1m6kEEYbPGDsioQL+tARG1dcjLVE/dNVwLKdQ TtdBCv5qQEV4kGbOXkodf18SeEpCnwbqJ1erM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=gc0kiIDwcYX+zF7zj0sEuquIY0xW7+qe2JNMZyafYSs=; b=fLs2FvfWBb8HEp7eCKHmEu5NsD15/zhyw/15SxMIEBtw73A//9j8cNuCoD/XFeqVcu k3YFWHbvNVwvkjjoUd8HXTNWoN2DW0qvRHyL8bvsIJtAcoXZszAWIBl5vDf1dRPJ+rjr nQkp7FMQ6N9f9AIMDPxS1MTr+UdToC+Rl4FbFz2hqLkAsEzha6WePu2L/KoTPEyudaRj 0Obl7LImSdMIG4HU9p2arOAW5BWLwsoYz1j/KGsu/K2fkCYRpbA5Og91P6OPq3C9fNdn OtzIIBHtBqO3rCO7CckWpKIplrjm5OPQ0E/pnubqss4smiWQ6nzvdsB3diUKpjGM7hc6 m/sg== X-Gm-Message-State: ACgBeo2IvV06wjPuuwd68rKRmO3ju1xuh41B+DIe6CDRT9Sq9WBupa8X CelzkV0r++feo/1ZM2Fa7bqZovkeZ50ZBg== X-Google-Smtp-Source: AA6agR52wGVW3bGpHpdWK6RBk1KbGMabuvfF8stZ5jn1gB/kgqoHVWqmzb5Q80m3SMzN0UIWVC+zAw== X-Received: by 2002:a05:6870:b00b:b0:113:5b32:3d4d with SMTP id y11-20020a056870b00b00b001135b323d4dmr5016338oae.8.1660268142193; Thu, 11 Aug 2022 18:35:42 -0700 (PDT) Received: from sjg1.roam.corp.google.com (c-67-190-102-125.hsd1.co.comcast.net. [67.190.102.125]) by smtp.gmail.com with ESMTPSA id x21-20020a056870b41500b0010c5005d427sm158518oap.33.2022.08.11.18.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 18:35:41 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Heinrich Schuchardt , Simon Glass , AKASHI Takahiro , Stefan Roese Subject: [PATCH v2 14/24] ide: Use a flag for an ATAPI device Date: Thu, 11 Aug 2022 19:34:53 -0600 Message-Id: <20220812013503.1724919-15-sjg@chromium.org> X-Mailer: git-send-email 2.37.1.595.g718a3a8f04-goog In-Reply-To: <20220812013503.1724919-1-sjg@chromium.org> References: <20220812013503.1724919-1-sjg@chromium.org> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Rather than setting a different interface type, use a flag to indicate that a device is ATAPI. Signed-off-by: Simon Glass --- (no changes since v1) drivers/block/ide.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 3270a9f032f..6bc48e3402e 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -525,8 +525,8 @@ static void ide_ident(struct blk_desc *dev_desc) { unsigned char c; hd_driveid_t iop; - #ifdef CONFIG_ATAPI + bool is_atapi = false; int retries = 0; #endif int device; @@ -550,7 +550,7 @@ static void ide_ident(struct blk_desc *dev_desc) (ide_inb(device, ATA_CYL_LOW) == 0x14) && (ide_inb(device, ATA_CYL_HIGH) == 0xEB)) { /* ATAPI Signature found */ - dev_desc->if_type = IF_TYPE_ATAPI; + is_atapi = true; /* * Start Ident Command */ @@ -623,7 +623,7 @@ static void ide_ident(struct blk_desc *dev_desc) dev_desc->removable = 0; #ifdef CONFIG_ATAPI - if (dev_desc->if_type == IF_TYPE_ATAPI) { + if (is_atapi) { atapi_inquiry(dev_desc); return; }