From nobody Mon May 16 13:21:24 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1A87E1AEDED6; Mon, 16 May 2022 13:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L20JN4vz0z4sMF; Mon, 16 May 2022 13:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652707284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zbxlaFi9ZegWOQUn5RRrr37dCHn26bCLYZYThjjG8o=; b=gm93VD3xa1mZHYSetcmajQl0vDgKwr3RnJfCHQ1CoASsMMhxdbahTzvuRf2asSA4gYrsI6 v4DZKlk8uYfiQKb6x5vaoa0MNIXIKmuCQgA4KOnO5KIm8N5mC5WABMZp575WgVacPB69Iz qM3uevPj13L2qXxKr5D/Tb3Kt8jazPwv+9CNCg2Lpp8EVEOkjGqio6UMQnfIwegz55hFmm NFpcsOibxP245rmZEAH2nCu7SG2fg9JrzCZjkcF3CTLZLdKKreSgq/LIeaF65Jhn6+lENb VXF1bevHNGY50qFbFTHdjTwUACITD8iGsnA8O8mRcbBULB7gd04SKkFbJB/98Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5EAFF20DB7; Mon, 16 May 2022 13:21:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24GDLOQK043105; Mon, 16 May 2022 13:21:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24GDLOFg043104; Mon, 16 May 2022 13:21:24 GMT (envelope-from git) Date: Mon, 16 May 2022 13:21:24 GMT Message-Id: <202205161321.24GDLOFg043104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Emmanuel Vadot Subject: git: cb26df12c116 - stable/13 - arm: allwinner: aw_gpio: Plug set but not used variable List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cb26df12c1167b2b05641a571a9c7cac427e7f4b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652707284; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1zbxlaFi9ZegWOQUn5RRrr37dCHn26bCLYZYThjjG8o=; b=yLKYpBOTYQrXxFQR/IPv2gRkQwG6EchtMgGeHxiXYM1j53AqMBoVz9dKiSd2e8wPc4za7Q 0CXJbjdLCz84r1gn17o5sOvv5+VtnOru2g+DkBEqPt+1of4tpKpmFnr9h9sczvawJEs44n oZR561MBwNhv2AWMeZcbVVKBWwZl5l8Utb7bvh0Er1VVSOkdW7S9kMbDeTZ21YfYuj1pZC GzBuYwrN6S2WtIFNFWq/T39Xk8HyTecOSbjdc/r6wF++tD4jqD2JSZllxBAhrjpNWqbczl jqJOvWCCNVfSjNzPfN6MvM9HA1K3C2oPx4U5Wa9N1NyhdodI2xmscnXIY8AaXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652707284; a=rsa-sha256; cv=none; b=gXDWoBrYSq4kRnQDpF+pdgmwfhlH23Saov27Dm75ZByvW8uRaeyr5uHCfoeqO5HF3/a5oX KnEnz4OYaZ38JjoNF/EBw3kl7hKFzxFlsF5mjrNd6jEwLPKnafXq2vE33lB/xvcPnP3l5D 0bapE3MSitViEThoBGJUnLQuVcoc8Li7D/ryI7VvnKXAtsmZoZqZBXl54MPYF72g1p2pFH CG86ljLBHkqQ1qS6J1F7y7qLZSW8IbM24+4Zyoro1oDS8ovgJV25iJIMHEJ2iVvY8uP7if so8i17qX15+8ICiF7dgH7oBNqhuXdhSRGCmntV4DW0nAYMghHA1MdAG+4aldMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=cb26df12c1167b2b05641a571a9c7cac427e7f4b commit cb26df12c1167b2b05641a571a9c7cac427e7f4b Author: Emmanuel Vadot AuthorDate: 2022-02-21 09:53:58 +0000 Commit: Emmanuel Vadot CommitDate: 2022-05-16 13:15:43 +0000 arm: allwinner: aw_gpio: Plug set but not used variable Sponsored by: Beckhoff Automation GmbH & Co. KG (cherry picked from commit 3dc60bab2750cdab9963c179786cd7d4f1931303) --- sys/arm/allwinner/aw_gpio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index c6be70aec493..1221384fb875 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -820,14 +820,13 @@ aw_gpio_pin_config_32(device_t dev, uint32_t first_pin, uint32_t num_pins, uint32_t *pin_flags) { struct aw_gpio_softc *sc; - uint32_t bank, pin; + uint32_t pin; int err; sc = device_get_softc(dev); if (first_pin > sc->conf->padconf->npins) return (EINVAL); - bank = sc->conf->padconf->pins[first_pin].port; if (sc->conf->padconf->pins[first_pin].pin != 0) return (EINVAL); @@ -1309,20 +1308,21 @@ aw_gpio_pic_setup_intr(device_t dev, struct intr_irqsrc *isrc, struct resource *res, struct intr_map_data *data) { struct aw_gpio_softc *sc; - struct gpio_irqsrc *gi; uint32_t irqcfg; uint32_t pinidx, reg; u_int irq, mode; int err; sc = device_get_softc(dev); - gi = (struct gpio_irqsrc *)isrc; + err = 0; switch (data->type) { case INTR_MAP_DATA_GPIO: err = aw_gpio_pic_map_gpio(sc, (struct intr_map_data_gpio *)data, &irq, &mode); + if (err != 0) + return (err); break; default: return (ENOTSUP);