Message ID | 20230328080702.27.I8b48a2c1e95c41b3ed1d864645e097ec2857645a@changeid |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=<UNKNOWN>) Authentication-Results: legolas.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=ion/uMul; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PljHT3FFTz1yYb for <incoming@patchwork.ozlabs.org>; Tue, 28 Mar 2023 06:17:09 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4FA7686168; Mon, 27 Mar 2023 21:17:06 +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="ion/uMul"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 71F3E86113; Mon, 27 Mar 2023 21:16:57 +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.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) (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 1B2EA86145 for <u-boot@lists.denx.de>; Mon, 27 Mar 2023 21:10: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=sjg@chromium.org Received: by mail-pj1-x102f.google.com with SMTP id h12-20020a17090aea8c00b0023d1311fab3so10020246pjz.1 for <u-boot@lists.denx.de>; Mon, 27 Mar 2023 12:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679944211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=tV4eNbjdHWpdZteGaJqb2ONafY7JK2RpeFE/7wPF8A4=; b=ion/uMuluatks88jaPORzBiLc66xnWG1JpC6reUh+h4eTrfEAlrNDHgCC3eNYaMEKl Ukmg6oG8gG7ep8R2vQbL0Mk/2QHp4Ve9Q+0z1LraqCZqTD5ljenf99kQUAT4sJKKlRAo s5s0yUU1CmvcClvt1tYdeHldqH4xlSEATYXoo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679944211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=tV4eNbjdHWpdZteGaJqb2ONafY7JK2RpeFE/7wPF8A4=; b=m7H59YaK/2swy82dlgvzH5LhYNvH6PFJbzps2ncZ80Bt1qgjCcBKKH3VHEqk9l97tu K+a2iD7pJo6lR25k82eRDS9ygBg+c10zshtWxogJ/8U6wE2M+2T0kgnct9MfpVr5pKqS CoKOHu8MNaK2owXqbip27Q2pQWsC/xlzN6/HRsOt/9l1DtrAc+zgqzhpX6Ze9ovo9onE 2mHoGwaNwxVHDL1sT3540vhpUrmXet57qvSPGsXKfrVxLE3mD4O35Iivohh8AGvmeSpO BALEXp0RhAjyadJiOmp/AoRjqNxbaj2J5n01/2jmdAZXSvvFWETwbq+H9Syy2ZxZCL1h anjA== X-Gm-Message-State: AO0yUKX6NmBHGvEoCWZmU2DydfrqgTFZEWZRLDGGp0+A4uIJbPHVDGtI Pzhe372WZfvWFeNFHbz6jBk2aMQj68T5RwCWfRk= X-Google-Smtp-Source: AK7set8KTT0cVKI6AVGRQ3POcXqsIfkaZOuN6IGTp2eU6a7Tc+sLUop1bpCbWLhqVgZvwkKQ4iOybg== X-Received: by 2002:a05:6a20:8089:b0:d6:b1b5:9917 with SMTP id c9-20020a056a20808900b000d6b1b59917mr10796859pza.57.1679944211466; Mon, 27 Mar 2023 12:10:11 -0700 (PDT) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id d9-20020aa78e49000000b005cd81a74821sm15653334pfr.152.2023.03.27.12.10.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:10:11 -0700 (PDT) From: Simon Glass <sjg@chromium.org> To: U-Boot Mailing List <u-boot@lists.denx.de> Cc: Bin Meng <bmeng.cn@gmail.com>, Simon Glass <sjg@chromium.org> Subject: [PATCH 27/30] ide: Tidy up ide_reset() Date: Tue, 28 Mar 2023 08:07:14 +1300 Message-Id: <20230328080702.27.I8b48a2c1e95c41b3ed1d864645e097ec2857645a@changeid> X-Mailer: git-send-email 2.40.0.348.gf938b09366-goog In-Reply-To: <20230327190717.1796230-1-sjg@chromium.org> References: <20230327190717.1796230-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean |
Series |
ide: Clean up code and fix a few bugs
|
expand
|
diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 72216540d040..fb409338783c 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -45,24 +45,23 @@ ulong ide_bus_offset[CONFIG_SYS_IDE_MAXBUS] = { #define IDE_SPIN_UP_TIME_OUT 5000 /* 5 sec spin-up timeout */ -#ifdef CONFIG_IDE_RESET static void ide_reset(void) { - ide_set_reset(1); /* assert reset */ + if (IS_ENABLED(CONFIG_IDE_RESET)) { + /* assert reset */ + ide_set_reset(1); - /* the reset signal shall be asserted for et least 25 us */ - udelay(25); + /* the reset signal shall be asserted for et least 25 us */ + udelay(25); - schedule(); + schedule(); - /* de-assert RESET signal */ - ide_set_reset(0); + /* de-assert RESET signal */ + ide_set_reset(0); - mdelay(250); + mdelay(250); + } } -#else -#define ide_reset() /* dummy */ -#endif /* CONFIG_IDE_RESET */ static void ide_outb(int dev, int port, unsigned char val) {
Avoid using #ifdef and use a single function declaration, so it is easier to read. Signed-off-by: Simon Glass <sjg@chromium.org> --- drivers/block/ide.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-)