From nobody Sun Feb 8 07:28:22 2026 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F151412F39D for ; Thu, 7 Mar 2024 14:36:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709822214; cv=none; b=OrJljjtb9RHq//mYNFVC7Uw0y9UAXzYe550RWmi0ZyqUg9pPfwEhUxxm3jyW9c/+pNHGulLVOWp30MjVPPdfQJbKE8VaJyDA5nhyhtopCINTy9WRre64NtzBmJdk1lDtv1CCYMpvcejfPEWXFRzRWk8NtFKS1MjWtdBAFtWEm/k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709822214; c=relaxed/simple; bh=xvcS3U4WyCuC99KlUMtUZiggvZqD/+Lbdgm2gFxqUiM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U1q+32Xtx9Y4KW6tyciCwivESrErbRpYGyrEJvAaZfvQMbOr8fQ8gG4R9QU/YHI/wItzk+L4d4IpqRaQO0Gc8ZOhaUoT63FLnumxswevTjP7aG/TIfSaKeC7QQw0kG0pNYHkr/nMn6YBX32moPyF152/+ZSDANWJfOGMw20f9Ho= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=FwJteYJG; arc=none smtp.client-ip=192.198.163.19 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="FwJteYJG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1709822213; x=1741358213; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xvcS3U4WyCuC99KlUMtUZiggvZqD/+Lbdgm2gFxqUiM=; b=FwJteYJGJ0R35s8xlUE8942rI4bUFLu5c8YHknqNbNejJXbQdXKhmCKK xu+sELQg2YquukODnO7CgpIyZzWBK8wbmMnpTRRsDaOrzvZknt1jYafFC k9aaPj/ittst5ftdrWDHAC6amor35ig0mq6icTTrzmqE6utk/TZV8PkNJ WbD0XuaWKD/OegbLExsGN0u7euYrcSCS6ot1/ou/9U42Ij6mOP7VujBBL RA/6/Fweq9xBC3A1H+0NU5olv6+fldMjGE3k7PfEsZP/bQC+wQPN3875t HSG1LZEZcl+GWYdFF2Gs3mvAuMWdxCgXk06MM8NyTK9Yj5PrpaGrz+O1B A==; X-IronPort-AV: E=McAfee;i="6600,9927,11006"; a="4348216" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="4348216" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Mar 2024 06:36:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,11006"; a="937046242" X-IronPort-AV: E=Sophos;i="6.07,211,1708416000"; d="scan'208";a="937046242" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga001.fm.intel.com with ESMTP; 07 Mar 2024 06:36:47 -0800 Received: by black.fi.intel.com (Postfix, from userid 1003) id 021CC4E9; Thu, 7 Mar 2024 16:36:45 +0200 (EET) From: Andy Shevchenko To: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski , Andy Shevchenko Subject: [PATCH v1 2/5] w1: gpio: Switch to use dev_err_probe() Date: Thu, 7 Mar 2024 16:35:48 +0200 Message-ID: <20240307143644.3787260-3-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.43.0.rc1.1.gbec44491f096 In-Reply-To: <20240307143644.3787260-1-andriy.shevchenko@linux.intel.com> References: <20240307143644.3787260-1-andriy.shevchenko@linux.intel.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" Switch to use dev_err_probe() to simplify the error path and unify a message template. Signed-off-by: Andy Shevchenko Acked-by: Uwe Kleine-K=C3=B6nig --- drivers/w1/masters/w1-gpio.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 8ea53c757c99..a5ac34b32f54 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c @@ -91,18 +91,14 @@ static int w1_gpio_probe(struct platform_device *pdev) return -ENOMEM; =20 ddata->gpiod =3D devm_gpiod_get_index(dev, NULL, 0, gflags); - if (IS_ERR(ddata->gpiod)) { - dev_err(dev, "gpio_request (pin) failed\n"); - return PTR_ERR(ddata->gpiod); - } + if (IS_ERR(ddata->gpiod)) + return dev_err_probe(dev, PTR_ERR(ddata->gpiod), "gpio_request (pin) fai= led\n"); =20 ddata->pullup_gpiod =3D devm_gpiod_get_index_optional(dev, NULL, 1, GPIOD_OUT_LOW); - if (IS_ERR(ddata->pullup_gpiod)) { - dev_err(dev, "gpio_request_one " - "(ext_pullup_enable_pin) failed\n"); - return PTR_ERR(ddata->pullup_gpiod); - } + if (IS_ERR(ddata->pullup_gpiod)) + return dev_err_probe(dev, PTR_ERR(ddata->pullup_gpiod), + "gpio_request (ext_pullup_enable_pin) failed\n"); =20 master->data =3D ddata; master->read_bit =3D w1_gpio_read_bit; @@ -119,10 +115,8 @@ static int w1_gpio_probe(struct platform_device *pdev) master->set_pullup =3D w1_gpio_set_pullup; =20 err =3D w1_add_master_device(master); - if (err) { - dev_err(dev, "w1_add_master device failed\n"); - return err; - } + if (err) + return dev_err_probe(dev, err, "w1_add_master device failed\n"); =20 if (ddata->pullup_gpiod) gpiod_set_value(ddata->pullup_gpiod, 1); --=20 2.43.0.rc1.1.gbec44491f096