From patchwork Tue Apr 9 09:27:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 1082056 X-Patchwork-Delegate: sjg@chromium.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="O77WXRqJ"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 44dhlT0wclz9sRd for ; Tue, 9 Apr 2019 19:27:33 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C4388C21E0D; Tue, 9 Apr 2019 09:27:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B499CC21DF9; Tue, 9 Apr 2019 09:27:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id E8580C21DF3; Tue, 9 Apr 2019 09:27:26 +0000 (UTC) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by lists.denx.de (Postfix) with ESMTPS id 91AA1C21DF8 for ; Tue, 9 Apr 2019 09:27:05 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id o25so2576732wmf.5 for ; Tue, 09 Apr 2019 02:27:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OecESHuezZafd3dqFU/IKa2RqcaA7X0MhlKAF0j8bws=; b=O77WXRqJtGocsJsxS1N75rYhsX+w0ft+v53vTtDgHxaTyQ+64QDFvgSW762GQqZPtJ roZv73bs8EtAuHge8MMRhvcEOVVt0HPYey/zRaK/YTA3qwM6Y8tqLAISq9Nu7Ra5/n1+ R0ZdPJ6wKBgzOuX6evYrlihROrKkUCK08HOO169VmbqwWxM5p49Sc1PuO17Lw3QqItlg cgV/x+p/VFvZ/VuzUV4KTzZ5+Fc130XytAkTcmPJ+cHxxOCaxrh+x97M5b7mXijuFoS7 JlNghzcyTs73h80HNpXXar4jo47bGtCxOUgG3NrUXlwFSThRAKL9IpjWyCaqE6S+yKUn QuiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=OecESHuezZafd3dqFU/IKa2RqcaA7X0MhlKAF0j8bws=; b=db4rvrE5afQyeENNI5bF35/ZnuPAhePcyqzphxNTdoWT2YDWATqsE+/G59XaBr9GoC WDjb/mUPLiM++1JZN2MR++gEIeM4w86E4UhvvSjELCrcOREAuThzAsKSwOUnLp7zxrf8 6rolgwOFqLYvWWeWP1DkJo5STZiYekpl6o7vhGTjzKm/oJrfBmnIne7+lsic2nxg2t9J 4ZZfzv29k7ii1QqIjfveP2wuYREiPocSnOEG4IiEybNOHPkqLeYeinqgctbnw/6oB224 uFGWdIWMSvOF8hDcGLLDRdOqOi0nmVBLdQBYXT0Jo1z4JgnO+m/y+LdCuBcKIcbj0uy5 VBgw== X-Gm-Message-State: APjAAAWJrGAdWNaZITziSdZCoRS9Xm3na68ZmPLERO9B+yYz2F9mh5uE Ro6ywaJ48faVHFR6uCI0/l2TBxxB X-Google-Smtp-Source: APXvYqwUfopC+70FGaI1exs6iA0gnHBoa8BVnr3ex2OwHuthZxzfj4qKnr0Dw4i6CtdjeU0z7kdHDw== X-Received: by 2002:a1c:9e96:: with SMTP id h144mr21480316wme.33.1554802024756; Tue, 09 Apr 2019 02:27:04 -0700 (PDT) Received: from chgm-pc-linux.bachmann.at ([185.67.228.2]) by smtp.gmail.com with ESMTPSA id t74sm3099642wmt.3.2019.04.09.02.27.02 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 09 Apr 2019 02:27:04 -0700 (PDT) From: Christian Gmeiner To: u-boot@lists.denx.de Date: Tue, 9 Apr 2019 11:27:00 +0200 Message-Id: <20190409092700.8425-1-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [U-Boot] [PATCH] dm: sound: make all functions static inline X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" Fixes following compile problem: ➜ u-boot-mainline git:(master) ✗ make sandbox_defconfig all NO_SDL=1 scripts/kconfig/conf --syncconfig Kconfig CHK include/config.h CFG u-boot.cfg GEN include/autoconf.mk GEN include/autoconf.mk.dep CHK include/config/uboot.release CHK include/generated/version_autogenerated.h CHK include/generated/timestamp_autogenerated.h UPD include/generated/timestamp_autogenerated.h CHK include/generated/generic-asm-offsets.h HOSTCC tools/mkenvimage.o HOSTLD tools/mkenvimage HOSTCC tools/fit_image.o HOSTCC tools/image-host.o HOSTCC tools/dumpimage.o HOSTLD tools/dumpimage HOSTCC tools/mkimage.o HOSTLD tools/mkimage HOSTLD tools/fit_info HOSTLD tools/fit_check_sign CC cmd/version.o GZIP cmd/config_data.gz CHK cmd/config_data_gz.h CHK cmd/config_data_size.h CHK cmd/license_data_gz.h CHK cmd/license_data_size.h LD cmd/built-in.o CC common/main.o LD common/built-in.o CC drivers/fastboot/fb_getvar.o LD drivers/fastboot/built-in.o LD drivers/video/built-in.o ld.bfd: drivers/video/sandbox_sdl.o: in function `sandbox_sdl_sound_play': /home/christian/projects/u-boot-mainline/./arch/sandbox/include/asm/sdl.h:110: multiple definition of `sandbox_sdl_sound_play'; drivers/video/video-uclass.o:/home/christian/projects/u-boot-mainline/./arch/sandbox/include/asm/sdl.h:110: first defined here ld.bfd: drivers/video/sandbox_sdl.o: in function `sandbox_sdl_sound_init': /home/christian/projects/u-boot-mainline/./arch/sandbox/include/asm/sdl.h:120: multiple definition of `sandbox_sdl_sound_init'; drivers/video/video-uclass.o:/home/christian/projects/u-boot-mainline/./arch/sandbox/include/asm/sdl.h:120: first defined here make[3]: *** [scripts/Makefile.build:355: drivers/video/built-in.o] Fehler 1 make[2]: *** [scripts/Makefile.build:432: drivers/video] Fehler 2 make[1]: *** [Makefile:1531: drivers] Fehler 2 make: *** [Makefile:485: __build_one_by_one] Fehler 2 Fixes: f2b25c9bf82 ("dm: sound: Complete migration to driver model") Signed-off-by: Christian Gmeiner Signed-off-by: Christian Gmeiner --- arch/sandbox/include/asm/sdl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/sandbox/include/asm/sdl.h b/arch/sandbox/include/asm/sdl.h index 1027b59e73..c45dbddd70 100644 --- a/arch/sandbox/include/asm/sdl.h +++ b/arch/sandbox/include/asm/sdl.h @@ -104,7 +104,7 @@ static inline int sandbox_sdl_sound_start(uint frequency) return -ENODEV; } -int sandbox_sdl_sound_play(const void *data, uint count) +static inline int sandbox_sdl_sound_play(const void *data, uint count) { return -ENODEV; } @@ -114,7 +114,7 @@ static inline int sandbox_sdl_sound_stop(void) return -ENODEV; } -int sandbox_sdl_sound_init(int rate, int channels) +static inline int sandbox_sdl_sound_init(int rate, int channels) { return -ENODEV; }