From patchwork Mon Mar 27 19:06:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1761937 X-Patchwork-Delegate: trini@ti.com Return-Path: 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) 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=FFmCGgn+; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4PljH60KJbz1yYb for ; Tue, 28 Mar 2023 06:16:50 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3D21A8609D; Mon, 27 Mar 2023 21:16:47 +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="FFmCGgn+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AF9E6857EC; Mon, 27 Mar 2023 21:16:45 +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-x102d.google.com (mail-pj1-x102d.google.com [IPv6:2607:f8b0:4864:20::102d]) (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 41CF286126 for ; Mon, 27 Mar 2023 21:09:16 +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-x102d.google.com with SMTP id l7so8625744pjg.5 for ; Mon, 27 Mar 2023 12:09:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1679944154; 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=buu/GkXt/8k6SNRWofxE2mrM9L+hggclEljvFVRqxm0=; b=FFmCGgn+IHSpLMKpKQ9g8+S3X7lCXMC+pRgMCzL25BkAZHet1zHUeC0NtarZ+3YGDx 7Wn0z4C8sRoUCmFUdEi6Aub78U19ggcHMOCAEOB4rth3OPMUli9GYtgaW2loNwg7ndTe 1kC7ewl4dFzB18NqUsE+0uuk6YjXNzK6fRFCQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679944154; 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=buu/GkXt/8k6SNRWofxE2mrM9L+hggclEljvFVRqxm0=; b=VrkJFhirmUiujmJcaDBkyXeYqhR38HsU90E2JOk7hLCuBpGLmcNHI5hD7sbiNVWe0v yFu8eETjYxWpAb9DaMvaqIxMy+WuHoQ6iDC9xDTi4gnsmt9L1Nyui/js99AXWPmwk6d5 uVitG4hMwSQU9BPuYIJ9XyzSL4rk3NixEPiO4WA8/mUjXQ2sq8g7G0ovt3P6kjyV5BWR V2N0z7MCGfNP5EqH3AsXtWnsqy9U+fwYJp5pPdYvme+yCGD8sgOzk3O5c2ZdX1xLSh3X SrvouJSDL2X6xgox5dQiwbRcapJJsBw5cSYWYt/b2tCMra3nQroMsqRrW9PTfZGhLKrM S7Og== X-Gm-Message-State: AO0yUKV8Jd/IVE2YxNA7z86fd23CuOlRTQQ29pyHE5pVEOaQakpYRQnJ NHdPwJ2ZXfzOmRaWMOpwk8+EwkJejJzjYVYfGlA= X-Google-Smtp-Source: AK7set8ZQHB1x78SCK30nicbWyxFaOjHAG81NCf8CrVjoNNSjDVGv6O4aPXXPbjUaXTu/zajEtk3fA== X-Received: by 2002:a05:6a20:af1c:b0:d9:3683:bc15 with SMTP id dr28-20020a056a20af1c00b000d93683bc15mr11028042pzb.19.1679944154148; Mon, 27 Mar 2023 12:09:14 -0700 (PDT) Received: from localhost.localdomain ([27.110.126.54]) by smtp.gmail.com with ESMTPSA id d9-20020aa78e49000000b005cd81a74821sm15653334pfr.152.2023.03.27.12.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Mar 2023 12:09:13 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Cc: Bin Meng , Simon Glass Subject: [PATCH 08/30] ide: Drop weak functions Date: Tue, 28 Mar 2023 08:06:55 +1300 Message-Id: <20230328080702.8.I849a603c3a9ab189f9576a7b2a58e5e244d895c2@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 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.8 at phobos.denx.de X-Virus-Status: Clean These are not used from outside this file anymore. Make them static and remove them from the header file. Signed-off-by: Simon Glass --- drivers/block/ide.c | 14 +++++++------- include/ide.h | 13 ------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/drivers/block/ide.c b/drivers/block/ide.c index 58f1ef8f1777..46e110fec5e8 100644 --- a/drivers/block/ide.c +++ b/drivers/block/ide.c @@ -75,7 +75,7 @@ static void ide_reset(void) #define ide_reset() /* dummy */ #endif /* CONFIG_IDE_RESET */ -__weak void ide_outb(int dev, int port, unsigned char val) +static void ide_outb(int dev, int port, unsigned char val) { debug("ide_outb (dev= %d, port= 0x%x, val= 0x%02x) : @ 0x%08lx\n", dev, port, val, ATA_CURR_BASE(dev) + port); @@ -83,7 +83,7 @@ __weak void ide_outb(int dev, int port, unsigned char val) outb(val, ATA_CURR_BASE(dev) + port); } -__weak unsigned char ide_inb(int dev, int port) +static unsigned char ide_inb(int dev, int port) { uchar val; @@ -94,7 +94,7 @@ __weak unsigned char ide_inb(int dev, int port) return val; } -__weak void ide_input_swap_data(int dev, ulong *sect_buf, int words) +static void ide_input_swap_data(int dev, ulong *sect_buf, int words) { uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf = (ushort *)sect_buf; @@ -164,7 +164,7 @@ OUT: /* since ATAPI may use commands with not 4 bytes alligned length * we have our own transfer functions, 2 bytes alligned */ -__weak void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts) +static void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts) { uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf; @@ -179,7 +179,7 @@ __weak void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts) } } -__weak void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts) +static void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts) { uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf; @@ -778,7 +778,7 @@ static void ide_init(void) schedule(); } -__weak void ide_output_data(int dev, const ulong *sect_buf, int words) +static void ide_output_data(int dev, const ulong *sect_buf, int words) { uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf; @@ -792,7 +792,7 @@ __weak void ide_output_data(int dev, const ulong *sect_buf, int words) } } -__weak void ide_input_data(int dev, ulong *sect_buf, int words) +static void ide_input_data(int dev, ulong *sect_buf, int words) { uintptr_t paddr = (ATA_CURR_BASE(dev) + ATA_DATA_REG); ushort *dbuf; diff --git a/include/ide.h b/include/ide.h index 09b0117879f7..8c0eb2a022fd 100644 --- a/include/ide.h +++ b/include/ide.h @@ -22,17 +22,4 @@ ulong ide_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, ulong ide_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, const void *buffer); -/* - * I/O function overrides - */ -unsigned char ide_inb(int dev, int port); -void ide_outb(int dev, int port, unsigned char val); -void ide_input_swap_data(int dev, ulong *sect_buf, int words); -void ide_input_data(int dev, ulong *sect_buf, int words); -void ide_output_data(int dev, const ulong *sect_buf, int words); -void ide_input_data_shorts(int dev, ushort *sect_buf, int shorts); -void ide_output_data_shorts(int dev, ushort *sect_buf, int shorts); - -void ide_led(uchar led, uchar status); - #endif /* _IDE_H */