From nobody Fri Apr 3 00:00:52 2026 Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ED6A134751C for ; Thu, 26 Mar 2026 09:36:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774517781; cv=none; b=Irs6W7I9RZPPx58vEf4T866NIkVFlHlL9GhZB3aYEf81wh7naWWpTsonYQfPPNbRxjfoJQqgr42MqcsC/eriyskSnIXQyxIgk6asCzjMI3oTZkAh73+wQrLStFq5g+iTrcFe39ZpSaH8iDRTD1VXim9PebGWHuYlX04iLIZIsyM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774517781; c=relaxed/simple; bh=MqMK9VUVSlSSc2e+r1jsvapXJDlKU7Fd8c54Oa8aqxU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=O+/bGEgZJF73n/xuefGHjNykAoVcK7i+eFV+pBoTgDIDp91/eNNPLY5mpzojpp6DONKTfSQJdo44MNUgKdPT6WmKohGKDTyrwkbz1EPzF+b9/EYokmn5+QlO523IbNYIA+KvQun0vvZvz6kzMDn5mXgQON0UXHSndrvUpQ4Difg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=hCOVkXFA; arc=none smtp.client-ip=209.85.128.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hCOVkXFA" Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-486b9675d36so6832565e9.0 for ; Thu, 26 Mar 2026 02:36:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774517777; x=1775122577; darn=vger.kernel.org; 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=3poub8+Fh0OV92kTHtG954iIg2TQ9IULJ9dkSalWiIM=; b=hCOVkXFAsKGcRFTdsbVfzuGgKikFlJzW1Q7sWsj3EUJw4UmgTLtFsGaTBcEXP5HI7X xQhMXt2VkyghmS5N0WWH7XobVThbMwCcKLZ6uVF1B+zZELXwPqjiHcKzekWoWzrtYtOv QwhcMA14Ewf9ndyJafsb4/3WM66IPCi7dDufQFYjxdv5UZNDMTNo3ue5hLBUKh6achLG NO35i8Pjov3cIr7UmBA+4PYqQt/8IjtC9/c/0DKsOzBpy6BHW63jIRTphDbYgDct3E5T 299Ro13ayWwGPhDEQqtugHV5g/TuG/xuJ8iTD89mfsrNecrGXZcIx0ZYfWOAvZOiTM8v UyYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774517777; x=1775122577; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=3poub8+Fh0OV92kTHtG954iIg2TQ9IULJ9dkSalWiIM=; b=E2VLceun3Ea3OCwwKFDC2CzOFWS4AVKQH0WYXj2xgxY6SSwMejQhnEWEcsLqSshy2d IzTt0EbEHPK6POveLKM8+EcJQ7zggorfJIlDdgAoRv57JKy+iifsEwk8UaDpeyu7BF2C /BYOb33YAUfJctqe1Of28qWFiVXXDvpXhi32tiB0aS/tOaNojWbfm/irgUWwp4u2ntvB o/KRuQat2CALwqC2kjHPPSqWUkYT7iEbOXk5lTZs06PyDhORz55tdxFg7ycBCG38n+4K TmHjd0IXRXLdGr3Fk4592ou77kek/7PTuaG+lq+R4ZDYjD047rZIe2RZDGFaWWB/j2gI /tmg== X-Forwarded-Encrypted: i=1; AJvYcCWW3gjF1oncF3OwVpuxkOLNT8duyvdV67LpvwmHCkgV4v+SP2HjWUA8YJKmlvuKIlv5dOwI4MvuhqANt2c=@vger.kernel.org X-Gm-Message-State: AOJu0YzpNKkJi8rPabCUaWSc7hUfMRlSshnXtOTZMHcfk09sOr9Pg4tm nndh4c5ZeupS0tDfYPhmfUDsW9+6ppkqf4CAm9QUKau2UTY1jq8X8BCk X-Gm-Gg: ATEYQzzd1LOt99onJ6rFhHTEX4TcBj3O/ug6q33EGqYw+WQCHVa0o53qVgwNehgTLer d4oxXNag+1UsqjWxY365QvW4wKaI1mEqxrt9QLdbOXB+GOtZHZEuQgz3Xae7IymU2i/rQMMpUGm Yl1D5VOMGXAJqlkBHUQyDnE6W8mNciq2/JODRXT6j6V2vS2G0IWqdo9SXSK4j5ykKcIuZsorZky jg5RRdl/lLF1Ng98aiNt9feHzoVBRegEdfOIu7Tiy58ykkhcCePdcZ1XcdYaraR9LdRnWD3xrbw a6BNZaULh5s+OC+8YiwkFd1rn5WaQ128AF7Tes2/rpRKhnaFVxJJpzwIXfZYNmIZ+lzpBk7MrgD jpRN1qR2z8dcmnJI7V0octBOthkBiaXtTkcnl1WyhrngK1wxGcW4TZ4hPcSTHHx7liVXHmwtxi+ BmU+tURbXwlIbiHrnpoZNfZhlwmcnkBLB5qg== X-Received: by 2002:a05:600c:4e12:b0:486:fe83:8621 with SMTP id 5b1f17b1804b1-48716056832mr99615075e9.23.1774517776502; Thu, 26 Mar 2026 02:36:16 -0700 (PDT) Received: from potato ([31.176.167.148]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722d236a9sm41224175e9.11.2026.03.26.02.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 02:36:15 -0700 (PDT) From: Omer El Idrissi To: gregkh@linuxfoundation.org Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Omer El Idrissi Subject: [PATCH v4 2/2] staging: rtl8723bs: cleanup return in sdio_init() Date: Thu, 26 Mar 2026 10:36:07 +0100 Message-ID: <20260326093607.13011-3-omer.e.idrissi@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260326093607.13011-1-omer.e.idrissi@gmail.com> References: <20260326093607.13011-1-omer.e.idrissi@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Make sdio_init() return errno from sdio_enable_func or sdio_set_block_size instead of _SUCCESS/_FAIL vendor-defined macros. Let rtw_resume_process_normal return errno returned by sdio_init instead of -1. sdio_dvobj_init returns NULL on error so leave that as is. Let sdio_dvobj_init use a slightly more readable and conventional error check for sdio_init(). Signed-off-by: Omer El Idrissi --- drivers/staging/rtl8723bs/os_dep/os_intfs.c | 8 ++++---- drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/rtl8723bs/os_dep/os_intfs.c b/drivers/staging/= rtl8723bs/os_dep/os_intfs.c index 7ba689f2dfc8..e943dcea1a21 100644 --- a/drivers/staging/rtl8723bs/os_dep/os_intfs.c +++ b/drivers/staging/rtl8723bs/os_dep/os_intfs.c @@ -1135,10 +1135,10 @@ static int rtw_resume_process_normal(struct adapter= *padapter) pwrpriv =3D adapter_to_pwrctl(padapter); pmlmepriv =3D &padapter->mlmepriv; /* interface init */ - /* if (sdio_init(adapter_to_dvobj(padapter)) !=3D _SUCCESS) */ - if ((padapter->intf_init) && (padapter->intf_init(adapter_to_dvobj(padapt= er)) !=3D _SUCCESS)) { - ret =3D -1; - goto exit; + if (padapter->intf_init) { + ret =3D padapter->intf_init(adapter_to_dvobj(padapter)); + if (ret) + goto exit; } rtw_hal_disable_interrupt(padapter); /* if (sdio_alloc_irq(adapter_to_dvobj(padapter)) !=3D _SUCCESS) */ diff --git a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c b/drivers/staging= /rtl8723bs/os_dep/sdio_intf.c index 358eac0837cf..d0feb28b7043 100644 --- a/drivers/staging/rtl8723bs/os_dep/sdio_intf.c +++ b/drivers/staging/rtl8723bs/os_dep/sdio_intf.c @@ -131,9 +131,7 @@ static u32 sdio_init(struct dvobj_priv *dvobj) release: sdio_release_host(func); =20 - if (err) - return _FAIL; - return _SUCCESS; + return err; } =20 static void sdio_deinit(struct dvobj_priv *dvobj) @@ -157,6 +155,7 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_f= unc *func) { struct dvobj_priv *dvobj =3D NULL; struct sdio_data *psdio; + int ret; =20 dvobj =3D devobj_init(); if (!dvobj) @@ -167,7 +166,8 @@ static struct dvobj_priv *sdio_dvobj_init(struct sdio_f= unc *func) psdio =3D &dvobj->intf_data; psdio->func =3D func; =20 - if (sdio_init(dvobj) !=3D _SUCCESS) + ret =3D sdio_init(dvobj); + if (ret) goto free_dvobj; =20 rtw_reset_continual_io_error(dvobj); --=20 2.51.0