From patchwork Wed Jan 10 18:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Carpenter X-Patchwork-Id: 13516390 X-Patchwork-Delegate: brendanhiggins@google.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 3651A4D5B5 for ; Wed, 10 Jan 2024 18:55:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="d32j8Kd3" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-40e586a62f7so9110875e9.2 for ; Wed, 10 Jan 2024 10:55:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704912926; x=1705517726; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=lV56HHPvogh+5biZ9cxmf8UKMIbrPi47569Laf2Liq8=; b=d32j8Kd3YFkahjDswf4DMAETaDnlxGXtOlejyaPPKBUtqu2q0XWewNf9D2H/5MRb/a klkYHjPj/nRy1QX22AUiLglogfUHfnyY2aUS1tOl6JvTMs+HS0SzBwf0VGAwS32kZwQ5 NR6Ix2XhnRUnjheGeucvSjS0ubs7eYz1ixJMxZQHcqUea4ZLoxr6+Bl0Yo0ltsludW6Q C4owdJftqI3js5ZP2qd2qqIarFdas77b1fhuFv+fIxkAEYMl9avmNIxsaEyrglYXPixU kzr8XW4rad/ilntMP5ZgUMQ8kg/Ssp/tgfdeeMxAbXUXwnPwYe2/Fb1D/S5kUQNrgIFQ n0Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704912926; x=1705517726; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=lV56HHPvogh+5biZ9cxmf8UKMIbrPi47569Laf2Liq8=; b=HT8Tq/7fIVxJeU95uLb6vvPsd5tykBs0Ar8es9fOS/LwEgo7dUGUJEBzDr/LmNEGdv cTApFvK2qeq+hszyxDEaLEtAysnm6sT9mNBWZrKE9ve2U2C+OGBK0bU+lFfbTFXhHtnd NdTfZqaKKdCxHZBNV93o3EC0yGspa8e7EzIByimqtV/4W7DdVNEGG7v2cLxXTv11jtGH /1hGyN3eBWBeR0veeJSQKjleYDVcq+3oorDSl7l92C7lwW0BB1kDiglrQ+cUwdSMhg2H yMZM/xKnTUvcfvF2A+7LSGNOGOiQH8txtnYfctraH06jjbb3kCjA+P2eYjCVLbT5AidX YG/A== X-Gm-Message-State: AOJu0Yzogsu68I1OFZ7ceR7UhxJNBc/I0lfjC+JqMv21uWRTOsNLyfHL Hc0VcbWmE04X0sqRV0B5cCCnaItGCSvQhA== X-Google-Smtp-Source: AGHT+IEyQfEjny2UIgLvyyO/XaQhfliiz8XN1V0+gJkWSFVvUtdDc/2P7Y8p5KvXAASPa0T3jX3GCA== X-Received: by 2002:a05:600c:5405:b0:40b:5e59:ccdb with SMTP id he5-20020a05600c540500b0040b5e59ccdbmr981187wmb.188.1704912926681; Wed, 10 Jan 2024 10:55:26 -0800 (PST) Received: from localhost ([102.140.209.237]) by smtp.gmail.com with ESMTPSA id p16-20020a05600c469000b0040e39cbf2a4sm3131306wmo.42.2024.01.10.10.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Jan 2024 10:55:26 -0800 (PST) Date: Wed, 10 Jan 2024 21:55:22 +0300 From: Dan Carpenter To: Brendan Higgins Cc: David Gow , linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] kunit: Fix a NULL vs IS_ERR() bug Message-ID: <39b4278f-35d2-4071-a3aa-ec49705272af@moroto.mountain> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding The kunit_device_register() function doesn't return NULL, it returns error pointers. Change the KUNIT_ASSERT_NOT_NULL() to check for ERR_OR_NULL(). Fixes: d03c720e03bd ("kunit: Add APIs for managing devices") Signed-off-by: Dan Carpenter Reviewed-by: Rae Moar Reviewed-by: David Gow --- It's a pity that there isn't a KUNIT_ASSERT_NOT_ERR_PTR() macro... lib/kunit/kunit-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/kunit/kunit-test.c b/lib/kunit/kunit-test.c index c4259d910356..f7980ef236a3 100644 --- a/lib/kunit/kunit-test.c +++ b/lib/kunit/kunit-test.c @@ -720,7 +720,7 @@ static void kunit_device_cleanup_test(struct kunit *test) long action_was_run = 0; test_device = kunit_device_register(test, "my_device"); - KUNIT_ASSERT_NOT_NULL(test, test_device); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, test_device); /* Add an action to verify cleanup. */ devm_add_action(test_device, test_dev_action, &action_was_run);