From patchwork Wed Jan 24 15:12:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 191616 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1058626dyi; Wed, 24 Jan 2024 07:19:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IHLVIvsQ8byOsQOLasoa6iTaAGYzJFmu9YWEKntDS1TMzqE9VLGxsxqIwOJAdt+ZOt69IMQ X-Received: by 2002:a17:902:ee4d:b0:1d7:3ad7:f24c with SMTP id 13-20020a170902ee4d00b001d73ad7f24cmr865508plo.36.1706109598330; Wed, 24 Jan 2024 07:19:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706109598; cv=pass; d=google.com; s=arc-20160816; b=RH8nOdmV2QSvnAEvO/utRLOIFsZAES8OICXzCnvYiBoy2Xg5GwjcXz/zTdiOQWGx0x 21g36WQzCIPeE/Tj+JQaErJcU218WeW0O1TW+vPZktpva9XpHrU5WIlRYEF9BKJ9DTSj bcSnUKc0YDEuXuqnMmI49vAMVal9tF9OvPJ5GEzgXHc/TW5fkF5PLw6pXbqTR9RhxEsx 61rQyRdMPSWfBQJxn62NM2EuuckfZp9ikdo9iTjUBOZ6Qk75YsI/vF5kTX3Ws+hNcAwU xdWNIcKMvBebL+9/kj5hxf89654vdX5c1yk6ShtC4iLgVBlwrBboZcim7ef2xbLSaQfD 51VQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=s34WAcFS7YmLudj+Nc5iYgo1xcAFqjeqgfAxqyK01rU=; fh=OTqbndbrC/nDdyLfuLve2bXKusxti1jgUablAP5Nmlw=; b=QIs1jMpe/UnBPqsaPmuMrOpXestOA/COx2j2wA2Xxoxa5WYjc0kp1TacJHqv8AiHgg jCrJntes0VlGLHQi6H3bm6QSO7jIqi9jqkSZKU2jbQKQYJpxua42hR7lrwAHIN4q0w2V v/m3elPWsWZfdMLRYnAXT3zK48nX71IQypzvoMKIRHFTKNwqnbaj1oDk7BEH8cchsfjn NrRd9RD1hNsr/g8422I4a3bTzzjxw8eLPmOLIbIMJ3yowRxYWm9ELuRkNQMhm5uUZAhk tPGAuVkzbG2oXpb3GM7Jmh8m2CUTHkj2AsTzxLuMUxobyyKMWukDB3K3+dC1V5huJ3ru SfPg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=R3u9vIWX; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37224-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37224-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id jb15-20020a170903258f00b001d3c3495ea4si10271061plb.192.2024.01.24.07.19.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:19:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37224-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=R3u9vIWX; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37224-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37224-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 26EDB285E50 for ; Wed, 24 Jan 2024 15:13:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BC18C77654; Wed, 24 Jan 2024 15:12:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="R3u9vIWX" Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 1154C7A707; Wed, 24 Jan 2024 15:12:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.149.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109160; cv=none; b=ITYLpX9efdsozkCa4bZ1uEACT6SyWg6uvGGj9liwU2O8TOQmLrt1XhLWfkdJkj4dRWC6aNaYShjhdLOIbCwpGJh01ItIeaOeywUyN/tqrQy3QlaYw2K9hNSHWRn3QDYcz3P2JMqD9ZU+lPZRV55d50HbFvBO06BopVtqDRgF4b8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109160; c=relaxed/simple; bh=pk9SStOkm9HtYlm53RC4FWe7ynG+SM2C/0oSSEXRu/A=; h=From:To:CC:Subject:Date:Message-ID:MIME-Version:Content-Type; b=DQyaJ2qypMtn1wN1dyEi6hCXhOmItp0rEQ6aiHrTgp4V7f64AroIrWd1w9pZDSd6GIS25Vn6y6YNBSyT065xJi5FqNq3D+GBnWIAqFdPDSQUfsRNCieEpbrxQ055vFyjAzo6GbJ8wNyXh3tkS+FJ8cRrDfFQmsdXAibfIvIjKL0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=R3u9vIWX; arc=none smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40O7L4cv000450; Wed, 24 Jan 2024 09:12:26 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding:content-type; s=PODMain02222019; bh=s 34WAcFS7YmLudj+Nc5iYgo1xcAFqjeqgfAxqyK01rU=; b=R3u9vIWXl/AMzsBrx F+g39TK/Htc+WQkKqRk0mH93zMTxvFff082Gk7JFsmT2Kw5a8gCPQ6qqH88Qt32j 0qCN6wo/o2xSPUZN7wz1nsQjBr9BgimjdvV72q3QHaiWa7jsle1Qbq8Uty8kRoyN cuwLuVVNJTtjVBA9QqQNAcNO97ofR0OXcPjOA7DzLk5bsJwTXQ1XOd9CxntFwOcm AEfkLr0nQ7Ipl4jp/p6Q4xh0uxuuceHsKAwRENkkpnsNnT+QHP9u1vBEzesH8jWq otFK9nQswhUSjyhuAGYw46LRT/BzXUveaozihSen1gP93KqWHxRDZmpAAfTJdTLE b8qFQ== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3vtmfhgxx7-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2024 09:12:25 -0600 (CST) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.40 via Frontend Transport; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 29F52820246; Wed, 24 Jan 2024 15:12:22 +0000 (UTC) From: Charles Keepax To: , CC: , , , Subject: [PATCH 1/6] mfd: cs42l43: Tidy up header includes Date: Wed, 24 Jan 2024 15:12:17 +0000 Message-ID: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: AozGL7WfIKeRKsB6yIVyXAejrXDCfbYL X-Proofpoint-GUID: AozGL7WfIKeRKsB6yIVyXAejrXDCfbYL X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788985578075584985 X-GMAIL-MSGID: 1788985578075584985 Use more forward declarations, move header guards to cover other includes, and rely less on including headers through other headers. Suggested-by: Andy Shevchenko Signed-off-by: Charles Keepax --- drivers/mfd/cs42l43-i2c.c | 6 +++++- drivers/mfd/cs42l43-sdw.c | 6 +++++- drivers/mfd/cs42l43.c | 8 +++++++- drivers/mfd/cs42l43.h | 9 +++++---- include/linux/mfd/cs42l43.h | 13 +++++++------ 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c index 4922211680c96..7162274a0b551 100644 --- a/drivers/mfd/cs42l43-i2c.c +++ b/drivers/mfd/cs42l43-i2c.c @@ -6,11 +6,15 @@ * Cirrus Logic International Semiconductor Ltd. */ +#include #include -#include #include +#include #include +#include #include +#include +#include #include "cs42l43.h" diff --git a/drivers/mfd/cs42l43-sdw.c b/drivers/mfd/cs42l43-sdw.c index 1d85bbf8cdd5d..d6962a5a35f65 100644 --- a/drivers/mfd/cs42l43-sdw.c +++ b/drivers/mfd/cs42l43-sdw.c @@ -6,11 +6,15 @@ * Cirrus Logic International Semiconductor Ltd. */ +#include #include #include -#include +#include #include +#include #include +#include +#include #include #include #include diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c index 7b6d07cbe6fc6..4e2bc5ad244a5 100644 --- a/drivers/mfd/cs42l43.c +++ b/drivers/mfd/cs42l43.c @@ -6,18 +6,24 @@ * Cirrus Logic International Semiconductor Ltd. */ +#include #include #include #include +#include #include -#include #include +#include #include #include +#include #include #include +#include #include +#include #include +#include #include "cs42l43.h" diff --git a/drivers/mfd/cs42l43.h b/drivers/mfd/cs42l43.h index eb4caf3938332..70129db9f916e 100644 --- a/drivers/mfd/cs42l43.h +++ b/drivers/mfd/cs42l43.h @@ -6,15 +6,16 @@ * Cirrus Logic International Semiconductor Ltd. */ -#include -#include -#include - #ifndef CS42L43_CORE_INT_H #define CS42L43_CORE_INT_H #define CS42L43_N_DEFAULTS 176 +struct cs42l43; +struct dev_pm_ops; +struct device; +struct reg_default; + extern const struct dev_pm_ops cs42l43_pm_ops; extern const struct reg_default cs42l43_reg_default[CS42L43_N_DEFAULTS]; diff --git a/include/linux/mfd/cs42l43.h b/include/linux/mfd/cs42l43.h index cf8263aab41bd..2239d8585e785 100644 --- a/include/linux/mfd/cs42l43.h +++ b/include/linux/mfd/cs42l43.h @@ -6,20 +6,21 @@ * Cirrus Logic International Semiconductor Ltd. */ +#ifndef CS42L43_CORE_EXT_H +#define CS42L43_CORE_EXT_H + #include -#include -#include #include #include #include -#include #include -#ifndef CS42L43_CORE_EXT_H -#define CS42L43_CORE_EXT_H - #define CS42L43_N_SUPPLIES 3 +struct device; +struct gpio_desc; +struct sdw_slave; + enum cs42l43_irq_numbers { CS42L43_PLL_LOST_LOCK, CS42L43_PLL_READY, From patchwork Wed Jan 24 15:12:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 191610 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1053799dyi; Wed, 24 Jan 2024 07:13:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHnTSVOQKHZkbFPW87LjG/hwWk6CeHcdTFvzNtqtsurpaopudmsD+eprooa01q7yPH2Ga+O X-Received: by 2002:a05:620a:1125:b0:783:1f65:cbb1 with SMTP id p5-20020a05620a112500b007831f65cbb1mr1868950qkk.31.1706109221757; Wed, 24 Jan 2024 07:13:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706109221; cv=pass; d=google.com; s=arc-20160816; b=vk2yrIHmXbM/JZsAZhuEy8BBh91hyV3T29BstKHBJGXb+isp2Uf8RJsI7KZ0OKgpFU RrWgg6AecWwrTNajIENzsEAAha54W+wc+eJZvaJTfwuIYxS/IJLHoR/qnug2XmpDjTIR /lO4rnnsSk0I91hf57CG6jJsWjTU/93JOxY4fpiIBN+SOGJ7yYrOrLVix97J2xaVdBxe DZEBJ2FOjerN2HG8tjdRg/GaR3e4M5vmy7DoqvXekINI5tfRXrOsmQwSJtha+YRNxqRx hztdzUpqBoaxwGL85h3mbIC+U1vsMQuFFsmQGGlDs9seUrd7Q6LHHkv+mwz/zWdo4tFG GjPw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=UAmUNjNglZyS7hY/q2jq7ASryAkphOCeaZdMTk9JhPw=; fh=OTqbndbrC/nDdyLfuLve2bXKusxti1jgUablAP5Nmlw=; b=ZdubaB3+OsA5Prtk+QD9G+LHN/IfmfylR25uLA5wm1CfEiGEHjl0qTSexPMNFsj8CZ qlySAz5C3ppwPQMLx3VglYQ8txOwT8nVW3a48erQf2OK8VYxDg6RNbKeUJPHLfJ0bwTT 4JpfWWEAG1cWcfaQKdhcPi31oUOL0dcjjLjBXlpTs6N+lEdLvncLHP3qBh8e7Ku3MdYG DKveqnVbRKYo8xA470kbLq0MtN3acV6ysq9gKWQWkFRaYGo+zWVNOCcS1x3HucQCYH0x +2hgRuyRRBAsSsAW0mJPvhoJD7LEH3YH+l7/1d/UHecQUubjaT9YYuN8lVDBw3yt0Ao4 wMJA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=d2KEYnie; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37225-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37225-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id i8-20020a05620a248800b00781706eb820si9909393qkn.196.2024.01.24.07.13.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:13:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37225-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=d2KEYnie; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37225-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37225-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 7511A1C23C7E for ; Wed, 24 Jan 2024 15:13:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ED77F7CF2B; Wed, 24 Jan 2024 15:12:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="d2KEYnie" Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 E2E0D7A73D; Wed, 24 Jan 2024 15:12:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.149.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109161; cv=none; b=OIqVbIGRJ4yy3pST7dh7S8WNzu2MnghkE5DT42mpeqjNvbBnKAyDdEPjz5gsF4oNTxw1miUcudsMnOpC/toGc9PQy7PDADWGmznOY2C0IlcRH/MnQErzD6d//pDE1ePRlbeGqCu/1VXtRcbBzaHWEw9k4KwySgEigvEFKIbURwY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109161; c=relaxed/simple; bh=ceYKVMP1sIHfuMD9zr8q+V6zUBR/GmLAtM3+c440sUo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EjItBluvoUV2mTgjc+Kaa7I20Y8CD/pVz4BT7WVdp8l/vgSWhNK0x1Zh7hcWyEyNOWwum77Zr7Cy68G2yMh5s40ZZq69hGqg76uKevOeyTfEQxl2sIN0kpgsYSCVeuL4ubmx8HP/b23A80aVngFGbe2zHirX/FG6KvLGJNRhqEg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=d2KEYnie; arc=none smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40O7L4cu000450; Wed, 24 Jan 2024 09:12:24 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=UAmUNjNglZyS7hY/q2jq7ASryAkphOCeaZdMTk9JhPw=; b= d2KEYnierMPR13TzXQJCIILQSSTCmUbWDn3TJzzmQ6yXH7W+L+fK2h/JV726Eia3 k/vWBA2bqI61k87NEULseHvmiiZWJihbXQBvFGQnrIXayuxL4pvz0E8RKB2w0+pe awVr5BlXE7FDJAZR7g6YQyKHS0d8HYEui6pKchkyimK7xa7wI2DLWUMbSR3O4JMQ wVGdii7SHiAnsiJ3s8RqG5+J31vXnm7TMAWJFnLMrBb0pDUbariScIrl+36vndQq t2rPpG20522zc2EtVvot127L5JuCyowv1bXaT29jZPT1bo3W0ATiulXrJxqXU6P0 bDE6Mg1WkM1E3ZXbS4TB4Q== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3vtmfhgxx7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2024 09:12:24 -0600 (CST) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.40 via Frontend Transport; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 2DB25820247; Wed, 24 Jan 2024 15:12:22 +0000 (UTC) From: Charles Keepax To: , CC: , , , Subject: [PATCH 2/6] mfd: cs42l43: Use __u8 type rather than u8 for firmware interface Date: Wed, 24 Jan 2024 15:12:18 +0000 Message-ID: <20240124151222.1448570-2-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> References: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: RSmkEUNS_LvGYccNZCvztoVmUzB97cOd X-Proofpoint-GUID: RSmkEUNS_LvGYccNZCvztoVmUzB97cOd X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788985183182430365 X-GMAIL-MSGID: 1788985183182430365 Suggested-by: Andy Shevchenko Signed-off-by: Charles Keepax --- drivers/mfd/cs42l43.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c index 4e2bc5ad244a5..65a331481d975 100644 --- a/drivers/mfd/cs42l43.c +++ b/drivers/mfd/cs42l43.c @@ -55,8 +55,8 @@ struct cs42l43_patch_header { __le16 version; __le16 size; - u8 reserved; - u8 secure; + __u8 reserved; + __u8 secure; __le16 bss_size; __le32 apply_addr; __le32 checksum; From patchwork Wed Jan 24 15:12:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 191611 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1054113dyi; Wed, 24 Jan 2024 07:14:05 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEEzVhggiThpQZKQ/Y8Mjez+ieiNcSfoR4q5nFLXfnKEZswB7037NYm2lDqMiCUndcBlSL X-Received: by 2002:a05:6214:2585:b0:681:7ba3:3649 with SMTP id fq5-20020a056214258500b006817ba33649mr3198082qvb.63.1706109245318; Wed, 24 Jan 2024 07:14:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706109245; cv=pass; d=google.com; s=arc-20160816; b=YUsrH4JgcvnJjqUjRQUkNf1h99lXpHFvMgKr2V9UipL/NAEYODuHRJdAmg181d5pdn AxUFKxSqHsn/hq339+LAUEn1PSnaSiRMTW0bC8cvkBput3cjLULWvaG7cXRSCxGumGMu esevk02EJtjoCzwzTT319262RYesfxJ2vlvxS/Xa0Nj/hExe1NfpclazXhjEuEZ9jA31 1VWp5Sx3VEl8V14VwBhMAi8OEfT6iHL2CE2tWyR6b2i5AqP9OK86V1iQoFHFF0BvMXFs J5Qsnv8WKzg1TVqXcAqPK6S0DxXLvOeH6rWiNpDuAhuPurZMNqSWM6tMyNtp64YMZDxS j2ow== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=zP71zJiMcBLIMsOwcfHrVKfWtO7pQrg+yAAaiRud60c=; fh=OTqbndbrC/nDdyLfuLve2bXKusxti1jgUablAP5Nmlw=; b=myUyu2tpzSPsbZdv7X6emE/vNCjRwt/p2LSlC1fQoV8ifmDfqhFrfR97GU5QPgd+0/ HCw3FnR9B6KIAzAeXtMFE15BbNPl2+BNMUfc8YfRszPhGZUgYX1W/CgfUlywcagROpw0 p/rzX9dGW1Ayk1XWKrowRmCu+9KZBg060Oi6tPn4CUcswItPid0/OF6k383OgVE5PE7o bfgnr22RTx7LM38X8kqwAKqYwT8u38VQVsB4RTgseiET/3TqFDWReZ3J8EnYV0qxY/Vb XXri9uC9A/wgrZ/BtQ4ghUmipV17/iJHFz1F6kUNaMBWWzDbL2glDygWNi1KR9Nm3vLo 5uWQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=gwX8Nl0q; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37226-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37226-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id x12-20020a05620a098c00b00783b6ef2b2fsi984323qkx.722.2024.01.24.07.14.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:14:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37226-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=gwX8Nl0q; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37226-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37226-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 0F12D1C24092 for ; Wed, 24 Jan 2024 15:14:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0EB047E57B; Wed, 24 Jan 2024 15:12:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="gwX8Nl0q" Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 0B6E27A73E; Wed, 24 Jan 2024 15:12:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.149.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109161; cv=none; b=kvbfjn7V5Trb86r7lhQiYOIwPgIkiroPwpjnbUfiL6UPNbRgdtzIVsAzDMsSvE30cYVXrG0wrC11MzMsvsXeACJOrZHsTtx8QNQyrykG8RqGvzStbmxyaUMwNtYtNKDMnGhqq84nMw2F+JzsJO6d+O6Rh+nfEEzPpwKrTwhhnAc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109161; c=relaxed/simple; bh=Zz52SDfR224CDCMoBiwJdfjDeIdqEPXzExz50qfgwrQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=L9+li7Lr4SWZCTPDjDvznaPFGFQeZ5hIKKlvusQLxzsSsOabe6p4eHBA0YXM8KQlHyfmdb22ElXeMq1xZOC3G5g2JpFeSCD3gag/1stOnQwLHiUylmt+OtUoLOoINTuKpR4aKqIkROzcpcKaP3S+vT0hz0Yc5Kl8LfdZezrydy4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=gwX8Nl0q; arc=none smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40O8PstD007460; Wed, 24 Jan 2024 09:12:25 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=zP71zJiMcBLIMsOwcfHrVKfWtO7pQrg+yAAaiRud60c=; b= gwX8Nl0qURQGm+q8Qgz+iGm7qlFwKqxh7C+2zOIL06XcSRpSHF3CiiRQkBy5cmOi sqan+HXGpsVROBcZWUfnfhfbfyijGVGLYmPoeC3toY+2b+EJ7Wd9qDl6q8UJrKd0 tiD80L1BrxzaiCQpnZQx810KqDUSrdFkg8K01aTGtWxbua1wE+pEdgGKqEYOy0Bv wUazdC9Ro1Sd4FWJfjW5oBfxiB0UcJJz6bwHLIvzu2RK5DTjmyc0714/7cdxF/lN 9dzVkFkfox05p+wH2RfUSOwHjxinrfl2ZuoygtNIJYTxES97rBBvGhfQo8MbnZfu e+ZHKjSQk/z6yiZLEk48Rg== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3vtmfhgxx8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2024 09:12:24 -0600 (CST) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40 via Frontend Transport; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 3AD81820248; Wed, 24 Jan 2024 15:12:22 +0000 (UTC) From: Charles Keepax To: , CC: , , , Subject: [PATCH 3/6] mfd: cs42l43: Add time postfixes on defines Date: Wed, 24 Jan 2024 15:12:19 +0000 Message-ID: <20240124151222.1448570-3-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> References: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: npSgXlqADQH1pGoVzRuXliRyCgHEyxx_ X-Proofpoint-GUID: npSgXlqADQH1pGoVzRuXliRyCgHEyxx_ X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788985207804928649 X-GMAIL-MSGID: 1788985207804928649 Suggested-by: Andy Shevchenko Signed-off-by: Charles Keepax --- drivers/mfd/cs42l43.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c index 65a331481d975..aea0f8f485785 100644 --- a/drivers/mfd/cs42l43.c +++ b/drivers/mfd/cs42l43.c @@ -27,30 +27,30 @@ #include "cs42l43.h" -#define CS42L43_RESET_DELAY 20 +#define CS42L43_RESET_DELAY_MS 20 -#define CS42L43_SDW_ATTACH_TIMEOUT 500 -#define CS42L43_SDW_DETACH_TIMEOUT 100 +#define CS42L43_SDW_ATTACH_TIMEOUT_MS 500 +#define CS42L43_SDW_DETACH_TIMEOUT_MS 100 #define CS42L43_MCU_BOOT_STAGE1 1 #define CS42L43_MCU_BOOT_STAGE2 2 #define CS42L43_MCU_BOOT_STAGE3 3 #define CS42L43_MCU_BOOT_STAGE4 4 -#define CS42L43_MCU_POLL 5000 -#define CS42L43_MCU_CMD_TIMEOUT 20000 +#define CS42L43_MCU_POLL_US 5000 +#define CS42L43_MCU_CMD_TIMEOUT_US 20000 #define CS42L43_MCU_UPDATE_FORMAT 3 #define CS42L43_MCU_UPDATE_OFFSET 0x100000 -#define CS42L43_MCU_UPDATE_TIMEOUT 500000 +#define CS42L43_MCU_UPDATE_TIMEOUT_US 500000 #define CS42L43_MCU_UPDATE_RETRIES 5 #define CS42L43_MCU_SUPPORTED_REV 0x2105 #define CS42L43_MCU_SHADOW_REGS_REQUIRED_REV 0x2200 #define CS42L43_MCU_SUPPORTED_BIOS_REV 0x0001 -#define CS42L43_VDDP_DELAY 50 -#define CS42L43_VDDD_DELAY 1000 +#define CS42L43_VDDP_DELAY_US 50 +#define CS42L43_VDDD_DELAY_US 1000 -#define CS42L43_AUTOSUSPEND_TIME 250 +#define CS42L43_AUTOSUSPEND_TIME_MS 250 struct cs42l43_patch_header { __le16 version; @@ -538,10 +538,10 @@ static int cs42l43_soft_reset(struct cs42l43 *cs42l43) regcache_cache_only(cs42l43->regmap, true); regmap_multi_reg_write_bypassed(cs42l43->regmap, reset, ARRAY_SIZE(reset)); - msleep(CS42L43_RESET_DELAY); + msleep(CS42L43_RESET_DELAY_MS); if (cs42l43->sdw) { - unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_DETACH_TIMEOUT); + unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_DETACH_TIMEOUT_MS); unsigned long time; time = wait_for_completion_timeout(&cs42l43->device_detach, timeout); @@ -561,7 +561,7 @@ static int cs42l43_soft_reset(struct cs42l43 *cs42l43) static int cs42l43_wait_for_attach(struct cs42l43 *cs42l43) { if (!cs42l43->attached) { - unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_ATTACH_TIMEOUT); + unsigned long timeout = msecs_to_jiffies(CS42L43_SDW_ATTACH_TIMEOUT_MS); unsigned long time; time = wait_for_completion_timeout(&cs42l43->device_attach, timeout); @@ -603,7 +603,7 @@ static int cs42l43_mcu_stage_2_3(struct cs42l43 *cs42l43, bool shadow) ret = regmap_read_poll_timeout(cs42l43->regmap, CS42L43_BOOT_STATUS, val, (val == CS42L43_MCU_BOOT_STAGE3), - CS42L43_MCU_POLL, CS42L43_MCU_CMD_TIMEOUT); + CS42L43_MCU_POLL_US, CS42L43_MCU_CMD_TIMEOUT_US); if (ret) { dev_err(cs42l43->dev, "Failed to move to stage 3: %d, 0x%x\n", ret, val); return ret; @@ -652,7 +652,7 @@ static int cs42l43_mcu_disable(struct cs42l43 *cs42l43) ret = regmap_read_poll_timeout(cs42l43->regmap, CS42L43_SOFT_INT_SHADOW, val, (val & CS42L43_CONTROL_APPLIED_INT_MASK), - CS42L43_MCU_POLL, CS42L43_MCU_CMD_TIMEOUT); + CS42L43_MCU_POLL_US, CS42L43_MCU_CMD_TIMEOUT_US); if (ret) { dev_err(cs42l43->dev, "Failed to disable firmware: %d, 0x%x\n", ret, val); return ret; @@ -696,7 +696,7 @@ static void cs42l43_mcu_load_firmware(const struct firmware *firmware, void *con ret = regmap_read_poll_timeout(cs42l43->regmap, CS42L43_SOFT_INT_SHADOW, val, (val & CS42L43_PATCH_APPLIED_INT_MASK), - CS42L43_MCU_POLL, CS42L43_MCU_UPDATE_TIMEOUT); + CS42L43_MCU_POLL_US, CS42L43_MCU_UPDATE_TIMEOUT_US); if (ret) { dev_err(cs42l43->dev, "Failed to update firmware: %d, 0x%x\n", ret, val); cs42l43->firmware_error = ret; @@ -957,7 +957,7 @@ static int cs42l43_power_up(struct cs42l43 *cs42l43) } /* vdd-p must be on for 50uS before any other supply */ - usleep_range(CS42L43_VDDP_DELAY, 2 * CS42L43_VDDP_DELAY); + usleep_range(CS42L43_VDDP_DELAY_US, 2 * CS42L43_VDDP_DELAY_US); gpiod_set_value_cansleep(cs42l43->reset, 1); @@ -973,7 +973,7 @@ static int cs42l43_power_up(struct cs42l43 *cs42l43) goto err_core_supplies; } - usleep_range(CS42L43_VDDD_DELAY, 2 * CS42L43_VDDD_DELAY); + usleep_range(CS42L43_VDDD_DELAY_US, 2 * CS42L43_VDDD_DELAY_US); return 0; @@ -1057,7 +1057,7 @@ int cs42l43_dev_probe(struct cs42l43 *cs42l43) if (ret) return ret; - pm_runtime_set_autosuspend_delay(cs42l43->dev, CS42L43_AUTOSUSPEND_TIME); + pm_runtime_set_autosuspend_delay(cs42l43->dev, CS42L43_AUTOSUSPEND_TIME_MS); pm_runtime_use_autosuspend(cs42l43->dev); pm_runtime_set_active(cs42l43->dev); /* From patchwork Wed Jan 24 15:12:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 191617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1059021dyi; Wed, 24 Jan 2024 07:20:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFaNBHZGtVKK1G6QkBYTVfJ/7uKFDf2ymFWt3xr5yPqC7S4Fks8RSkwdEq/WQeNDH6V+2ED X-Received: by 2002:a17:90a:ea13:b0:28c:caa0:4f00 with SMTP id w19-20020a17090aea1300b0028ccaa04f00mr3876223pjy.10.1706109633360; Wed, 24 Jan 2024 07:20:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706109633; cv=pass; d=google.com; s=arc-20160816; b=K413wvPJbZOCY2x8fjm4SZ3aD2lVv7In/tWlG80eBREoO/a/bEpQmua6SaUctiOWQZ 52TdFoHhoQW+/HEK1Kmha9rK8nHeJONy8bVWbypohn/M3cQPFgmNWxh4fGOREWEDOnVx Ts6z+t80AQ3VUWbRA4AhPoyAbxh7YWMMDC/WhipICEW2OxZ3azWXNhd7VJrISwMB/miA IucooV5fH3RDuF3h404GUrFmo2ulcKkf8Ied9i6kHoY2f51c8/Z4kVGUQpW+SiLrzC0e fFImQJo+kOIMggi/Aiq3GTgj5icvN/dfRTN8aJOUGX9xf5PQhnoimM13wjwJ7bYOXXWF LWbg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=AwR6C1+x9dj3mRA8FTLGca+Bnav8YT0q1yASPkfi4B4=; fh=OTqbndbrC/nDdyLfuLve2bXKusxti1jgUablAP5Nmlw=; b=XSrOshr2fmZFXNj+C5CEpmHqZaLHvViPZGA6f+MeOgI5fsRcaSTLc9VYLNFukOm6qF KhN6tVPd0p+vjJaI+VOJoCVLt1F42OaH3yuyN8QlOOc2PKGJ3Xd3j+LtfcE6nQ0yYEr3 hKjcAcLzdeuXytemU5GhiS4fkJc0bmiZtein774Z+6g80JmS1xZwksnbOXAx1MPlFsvJ YFQt+ELOi+M6VQkhJ1CUEPNbJk6pHp3xgJuFEyw7k7uNPtV4utuf1pVjwvy0N9FJyJMr KuLyZK80lW/RfF1FianIAbxXqoN8M8cl/HAfw6bTGGXQSa8/qyQI522ghmGU2rFbU0CB EVvw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=orjibm9X; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37228-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37228-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id q5-20020a634305000000b005cee61cfde6si11396145pga.437.2024.01.24.07.20.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:20:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37228-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=orjibm9X; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37228-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37228-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 1540E28A203 for ; Wed, 24 Jan 2024 15:14:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2FE887E59C; Wed, 24 Jan 2024 15:12:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="orjibm9X" Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 C86017C08D; Wed, 24 Jan 2024 15:12:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.149.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109163; cv=none; b=gOup2cOReUxX3yguahFpoDSNkrXZFsPboO6agahPxGQDPSeyJHjOaE0IRsKoK7PpY5IPMIMcyC99O359iBjRkafWOfS0neV8JFGqGzHMGzZ5fj9uTFxfBfjOKUc2vFkDdOLjdGYL6C4kZPZp0ptzmy60EH3ghnY2Z4Xwmd2zHp4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109163; c=relaxed/simple; bh=ATN4BkgH0lZOB8gE/0EB0dUVYI+ZIu03Xpg1E9oDN64=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=PcuzX6ZBIiKDOl9NI2Pina5x+eTor9wA0LA3T0T/CkZ2dItVSI+MUnLSPDPF9Z9iCXP8+f84HVs6+Bm98xjCh7b1cncTQKWIl9o8ApB0BPTgISsGm5MuqBQumCAvm6W9LOwZ3t7N/GNWLcDJoXXfOfuNZhTZXSQjEYMBAUsbSQQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=orjibm9X; arc=none smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40O7L4cx000450; Wed, 24 Jan 2024 09:12:28 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=AwR6C1+x9dj3mRA8FTLGca+Bnav8YT0q1yASPkfi4B4=; b= orjibm9X5zCK/LUY41SQhw4sg1ora4sqoreJnMqIfld/Fspf7+jqKYAAC9mTMzWi C3xSmnCQspJ8JR1g8nATJ+323ouaqueiXGTt+IPpDT6bBao1UoLgJEB+wocyWUt1 p3/mU0u/B6w6jQzK2kYAD2bRkLRYnJiuQ9ZTcqC9WuPi6cBAQ3tL1yfOikP/dQYf 3mHng2P963xgcXSJtrKgk93vlOMS/TecmgK+j9uB6Iiw6DG4idmufB7bJ99kdJlZ Az2hN6osI6nIbrBbjSJGaw36ZTHL2HijPylJ9oMMrW2QqD9i7KGiaKib5BcMRju7 7Nri7YuJrRJ1EUzfwaWQEw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3vtmfhgxx7-4 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2024 09:12:27 -0600 (CST) Received: from ediex02.ad.cirrus.com (198.61.84.81) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by anon-ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server id 15.2.1118.40 via Frontend Transport; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 47882820249; Wed, 24 Jan 2024 15:12:22 +0000 (UTC) From: Charles Keepax To: , CC: , , , Subject: [PATCH 4/6] mfd: cs42l43: Add some missing dev_err_probes Date: Wed, 24 Jan 2024 15:12:20 +0000 Message-ID: <20240124151222.1448570-4-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> References: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: N7EMzrEFe-zMAcG550JDnS65412RnVn2 X-Proofpoint-GUID: N7EMzrEFe-zMAcG550JDnS65412RnVn2 X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788985614705055970 X-GMAIL-MSGID: 1788985614705055970 Use of dev_err_probe was missed in the i2c and sdw parts of the code, update the missing parts. Suggested-by: Andy Shevchenko Signed-off-by: Charles Keepax --- drivers/mfd/cs42l43-i2c.c | 9 +++------ drivers/mfd/cs42l43-sdw.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/mfd/cs42l43-i2c.c b/drivers/mfd/cs42l43-i2c.c index 7162274a0b551..c9e4ea76149a8 100644 --- a/drivers/mfd/cs42l43-i2c.c +++ b/drivers/mfd/cs42l43-i2c.c @@ -38,7 +38,6 @@ static const struct regmap_config cs42l43_i2c_regmap = { static int cs42l43_i2c_probe(struct i2c_client *i2c) { struct cs42l43 *cs42l43; - int ret; cs42l43 = devm_kzalloc(&i2c->dev, sizeof(*cs42l43), GFP_KERNEL); if (!cs42l43) @@ -50,11 +49,9 @@ static int cs42l43_i2c_probe(struct i2c_client *i2c) cs42l43->attached = true; cs42l43->regmap = devm_regmap_init_i2c(i2c, &cs42l43_i2c_regmap); - if (IS_ERR(cs42l43->regmap)) { - ret = PTR_ERR(cs42l43->regmap); - dev_err(cs42l43->dev, "Failed to allocate regmap: %d\n", ret); - return ret; - } + if (IS_ERR(cs42l43->regmap)) + return dev_err_probe(cs42l43->dev, PTR_ERR(cs42l43->regmap), + "Failed to allocate regmap\n"); return cs42l43_dev_probe(cs42l43); } diff --git a/drivers/mfd/cs42l43-sdw.c b/drivers/mfd/cs42l43-sdw.c index d6962a5a35f65..65f7b1d782486 100644 --- a/drivers/mfd/cs42l43-sdw.c +++ b/drivers/mfd/cs42l43-sdw.c @@ -171,7 +171,6 @@ static int cs42l43_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_id * { struct cs42l43 *cs42l43; struct device *dev = &sdw->dev; - int ret; cs42l43 = devm_kzalloc(dev, sizeof(*cs42l43), GFP_KERNEL); if (!cs42l43) @@ -181,11 +180,9 @@ static int cs42l43_sdw_probe(struct sdw_slave *sdw, const struct sdw_device_id * cs42l43->sdw = sdw; cs42l43->regmap = devm_regmap_init_sdw(sdw, &cs42l43_sdw_regmap); - if (IS_ERR(cs42l43->regmap)) { - ret = PTR_ERR(cs42l43->regmap); - dev_err(cs42l43->dev, "Failed to allocate regmap: %d\n", ret); - return ret; - } + if (IS_ERR(cs42l43->regmap)) + return dev_err_probe(cs42l43->dev, PTR_ERR(cs42l43->regmap), + "Failed to allocate regmap\n"); return cs42l43_dev_probe(cs42l43); } From patchwork Wed Jan 24 15:12:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 191634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1073159dyi; Wed, 24 Jan 2024 07:43:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IGRTn+6ZhcJhT4wOHBLIoB+HdnSn52mASyGg7BzfK+1vclUrMipfz6eIQ11N3IpQ+rUkIcD X-Received: by 2002:a05:6a20:7293:b0:19c:523a:8787 with SMTP id o19-20020a056a20729300b0019c523a8787mr1381463pzk.20.1706111002807; Wed, 24 Jan 2024 07:43:22 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706111002; cv=pass; d=google.com; s=arc-20160816; b=uSiiRvee4yjNmFrayhRx1+BPt0115CkNUTHK4F3xz/CYbm2zSmD6xJPEoKefk1UT0D wVQ1s+x9rRqNOuS4zDP6f8XhRwLPegAdoz6rm/4/IRFTbQ73VNVN/YlzxpjIk8uvVTnQ Nj5iXZRrMzvuDTKN4ksKF0bYZGD11U3AIz8Znh9Zp3JKCRERyUSLFKhfE3T5JHFZWvna QeqELhw53/KvRo+yjpeey5sVhPn/Y7+Sw1fg0lvf2dPYewfWxbh9AECVdy2p1MbIwtlL Ul4uKdgrPtguVKDTpSA9L7RkWjE2Z9/XTxHpb5uRrRaobP/r1uoPRxYDPcFHFXsPGJmP Px/g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=xqockhO3PC0w8zteR8DQgwdzsYaq2lS11Dt4dduvSI4=; fh=OTqbndbrC/nDdyLfuLve2bXKusxti1jgUablAP5Nmlw=; b=b+ZMuiaXeK9FkTLwL82vql3voK3sre+3HuBPSkTxTrt0VsqRQX1UjDH5XGzWgbAzIz d69pGGVgstf8lHXdGq+fattYisg+qvnz4ujfInzvUTDwmB+iJt2p0Vh7fIl4ycl9CDaw 5hotb1VTNfkSI3bjJFfd39MoEf+1Pj0oNGHcGYlmZwIzWnwbn/nDZUX/DOjDIPuWaX0f XEr4/2vlR1Raqh68lVt3DcO74hpt9tZsHO2/mB+h90QVPUifdOyQ1IIsGErnOuXIii0A d5ZRvTz1Dhxz2mt3jDTyAW80T0EKADPrgsLcBNtkV43OZD49IaM/k1T1yG88XCp2xNo2 Q6Iw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=fZLq6Zj0; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37227-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37227-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id y38-20020a631826000000b005ce01eee2afsi11598607pgl.836.2024.01.24.07.43.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:43:22 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37227-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=fZLq6Zj0; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37227-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37227-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 72052B2C607 for ; Wed, 24 Jan 2024 15:13:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 810577E569; Wed, 24 Jan 2024 15:12:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="fZLq6Zj0" Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 4453D7C082; Wed, 24 Jan 2024 15:12:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.149.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109161; cv=none; b=SPiNHXVadf9gKbASuHv7PzGrz6euYscVTU1bMHe1OVST2lNJ+LY9G3WzEYwYLU5WWXFmwUsCmhoV+bErBJK3TsKcYDyZIRR3e/c1NNbGFS1VIngDKM7lhlSQaa1IvH/Jy/U3EiXSvtq6Xpj1MYAcB25A956QSGzLlJT9gDOqgkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109161; c=relaxed/simple; bh=8fSzUVey984nMEt+aAXA7c16HLFwu6d7XSq7GXLETks=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=EPiyCq/jJcde7LAjianE+ol4IgN7GtyUtLjcWhJbG79DHdnIC4XmyrKsNsm25Pkir9JFbCC5z21ezX+UcDTvbGRi69iKKwcqq6cebtn56Nx7nyvPSCiHpLE/9sK/15M3Ge1WWslunn/fv2+MmamasbgUS9zWyUGeTSMtQz0EcYQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=fZLq6Zj0; arc=none smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40O8PstE007460; Wed, 24 Jan 2024 09:12:26 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=xqockhO3PC0w8zteR8DQgwdzsYaq2lS11Dt4dduvSI4=; b= fZLq6Zj0KpSFrjCQCa7XA5r9C+aAkPNzuD7IZSYXYlTPws6C3OoL0nhQQC2VeQjD cexHOq8T4TC0UKMjpGUZDg8ULpSuflfQBnUkkBHLmGiInIlskMDp8WNeCDBD9fvy MER/ZAxr34t+ggBDFfbMhO4+jfkvry5upd7t/pWpmCYUG08UT7/sCg02KmC8gvox bo2cjZOhJXmdmalwafvlA2RmZwP2gmVOBvCqjixlvFzZKb72FmUJlQpu5etxy/vS 6AkNejLlwKHcjhXt4EaASd3J9jxmzjjZSwC68x7s3dq87ORy/ZrpGbmKC/RjWQy9 BJn40LEbvo5PdgF2SWgrXA== Received: from ediex01.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3vtmfhgxx8-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2024 09:12:25 -0600 (CST) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40 via Frontend Transport; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 5386882024A; Wed, 24 Jan 2024 15:12:22 +0000 (UTC) From: Charles Keepax To: , CC: , , , Subject: [PATCH 5/6] mfd: cs42l43: Handle error from devm_pm_runtime_enable Date: Wed, 24 Jan 2024 15:12:21 +0000 Message-ID: <20240124151222.1448570-5-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> References: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: ht3Mncp21og942O5GIgF56txXAIWH9sr X-Proofpoint-GUID: ht3Mncp21og942O5GIgF56txXAIWH9sr X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788987051002986847 X-GMAIL-MSGID: 1788987051002986847 As it devm_pm_runtime_enable can fail due to memory allocations, it is best to handle the error. Suggested-by: Andy Shevchenko Signed-off-by: Charles Keepax --- drivers/mfd/cs42l43.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mfd/cs42l43.c b/drivers/mfd/cs42l43.c index aea0f8f485785..56bd9dbbe10b0 100644 --- a/drivers/mfd/cs42l43.c +++ b/drivers/mfd/cs42l43.c @@ -1065,7 +1065,9 @@ int cs42l43_dev_probe(struct cs42l43 *cs42l43) * the boot work runs. */ pm_runtime_get_noresume(cs42l43->dev); - devm_pm_runtime_enable(cs42l43->dev); + ret = devm_pm_runtime_enable(cs42l43->dev); + if (ret) + return ret; queue_work(system_long_wq, &cs42l43->boot_work); From patchwork Wed Jan 24 15:12:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Charles Keepax X-Patchwork-Id: 191612 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:2553:b0:103:945f:af90 with SMTP id p19csp1054400dyi; Wed, 24 Jan 2024 07:14:24 -0800 (PST) X-Google-Smtp-Source: AGHT+IFP4BAFi46JlZSJI6RpfRXltVN3P8PSaaEsH2JmhM8vGidLyiGRvLz8CLGZW4hwf9camwZC X-Received: by 2002:a2e:b450:0:b0:2cd:f645:d9b9 with SMTP id o16-20020a2eb450000000b002cdf645d9b9mr971025ljm.63.1706109264124; Wed, 24 Jan 2024 07:14:24 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706109264; cv=pass; d=google.com; s=arc-20160816; b=OG3mNvPLXTXIlVJ5SYQ2Z7i2+KtoVHMaztenFGIJZmXrgGFdvm2nDx1Vp8FrrHIQeR Un8MFI43xblgZFUpRLoTJgsopb9g8imcWPz0wX2Vs2dVnYbNeliVG5igfpNUS70rokCX X62IXVBoLgULY5LyxcIZKrutpx7gRfl4pUWNYBSelyV6EfNIT+BstXln6kXt6iQFJ4HC 4AcOkYHK0wRPHui8xAk3G9fbaxyAJtf/zGxW9utb+Xn0jRHybXcjnHw/8+vD2H8s58lC qFylsPLv1d7A8MBzyL4tmS4API0sCvlEliHapFgmtsnCVL0NmtfNw5GoQyfDblFCMM2g joYQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=wgj3eRfleW5Mz0nqH1lHLI3/P/b9w4Ck+OmjbqRx6q0=; fh=OTqbndbrC/nDdyLfuLve2bXKusxti1jgUablAP5Nmlw=; b=FdZnFWAT6Xh+LtLd8Z6i8O87zqXdsTSNRAuNbSfNYo9tidIt5S48toC0XF7/B81cKY tHcew1VXX6Ium+KUyaPSak1yV5qzEXn5u30qS8hw4pXwpSxIp8/yWiiRP8h+c/DdQeng F2qDUnkUGTMs0pxUOHRSEiVjzYggMtp/qLO9CFPcaKl6pBwNxR0QINgiCrTMfrDsElRZ 740pv0ViNmdfDwurRu32ax+k1uFkRElgQ00Rj+uJrPS3Xt5bgC5VgXCzgQHzlSsLF4mU fLorXqBm9hCuYkUS+zoML8Jyy8pkFsyvOJKDfbkPvqrwc0mFeVLDFexiTS12FaMaDwZ9 JZ/Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=OoDnj98G; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37229-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37229-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id y13-20020a50e60d000000b00559476ecefdsi10135608edm.650.2024.01.24.07.14.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jan 2024 07:14:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-37229-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@cirrus.com header.s=PODMain02222019 header.b=OoDnj98G; arc=pass (i=1 spf=pass spfdomain=opensource.cirrus.com dkim=pass dkdomain=cirrus.com dmarc=pass fromdomain=opensource.cirrus.com); spf=pass (google.com: domain of linux-kernel+bounces-37229-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-37229-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=cirrus.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id ADEF41F25C0B for ; Wed, 24 Jan 2024 15:14:23 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8C86E7E568; Wed, 24 Jan 2024 15:12:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b="OoDnj98G" Received: from mx0b-001ae601.pphosted.com (mx0a-001ae601.pphosted.com [67.231.149.25]) (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 8089F7C0B1; Wed, 24 Jan 2024 15:12:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=67.231.149.25 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109163; cv=none; b=Ov8hKe4VBgDhIuwvDLieRID4lr/jWnPIDgv+XIieh7oawEnqeba6EjIdRo6XpNPiWsiKDZGlPjBrsh+n9WXV66cS9hbZXFsMXWQAppjD0wmi4Xms3YFyvhkbwsJCyGvgocl9egmICIeHvbVRzRJ+UIHmO2yK/P3XtgwG/Dcn6Ns= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706109163; c=relaxed/simple; bh=hF3K/gUsFrwyAXguG8YMNRx6B6jS2KuTPFZt05WQXmM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mPIPrCTgF/f8/s5kwpndA/pJe+1S0S2i48CnPrAeAAQ4POGc8YXr5uxNmGqne/jHtU1hAiU2V9WPgqIAq/TO8kH+uiUJgMugufbQAYwRm588NosniGZ5F0h3scMM/pVUjSFI2OwJ05YDyzcWCbngwU2F/qMK8KFA9FE3F7SJy9c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com; spf=pass smtp.mailfrom=opensource.cirrus.com; dkim=pass (2048-bit key) header.d=cirrus.com header.i=@cirrus.com header.b=OoDnj98G; arc=none smtp.client-ip=67.231.149.25 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=opensource.cirrus.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=opensource.cirrus.com Received: from pps.filterd (m0077473.ppops.net [127.0.0.1]) by mx0a-001ae601.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 40O7L4cw000450; Wed, 24 Jan 2024 09:12:27 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cirrus.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding:content-type; s= PODMain02222019; bh=wgj3eRfleW5Mz0nqH1lHLI3/P/b9w4Ck+OmjbqRx6q0=; b= OoDnj98G4FC8Xkhqm2eLfEeybaMnAaY6nAS7eWfVlzMTVg4AbRtIW3dtxw1L+2s9 LaSMe5Ug77xMpsUer+ZAadpdj2SJ4CNpa9lRdCrRkXbVSM6HJc68CwQdnIzqFANm G9HIjB3G+Zo+nkxJXsvlvpGFdmgPSPxFw05k3lFdf/7ppDnjJ1iT3jYzVAukrdiK dY+mCs6vjhaCZYd44oIQ4txyIyQuwA7zLAZYr6mPewhExDeUDZhBNQdjnY8KEfdi 3NQN4mVCTRD7W8HAZmWeIDig0Xw7/CK13M29kE7QziPe6+TN3H7aKarCKvPhgK82 x2DKcRimslMOOGjaNxGaRw== Received: from ediex02.ad.cirrus.com ([84.19.233.68]) by mx0a-001ae601.pphosted.com (PPS) with ESMTPS id 3vtmfhgxx7-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 24 Jan 2024 09:12:26 -0600 (CST) Received: from ediex01.ad.cirrus.com (198.61.84.80) by ediex02.ad.cirrus.com (198.61.84.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswmail9.ad.cirrus.com (198.61.86.93) by ediex01.ad.cirrus.com (198.61.84.80) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.40 via Frontend Transport; Wed, 24 Jan 2024 15:12:22 +0000 Received: from ediswws07.ad.cirrus.com (ediswws07.ad.cirrus.com [198.90.208.14]) by ediswmail9.ad.cirrus.com (Postfix) with ESMTP id 607A682024B; Wed, 24 Jan 2024 15:12:22 +0000 (UTC) From: Charles Keepax To: , CC: , , , Subject: [PATCH 6/6] spi: cs42l43: Tidy up header includes Date: Wed, 24 Jan 2024 15:12:22 +0000 Message-ID: <20240124151222.1448570-6-ckeepax@opensource.cirrus.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> References: <20240124151222.1448570-1-ckeepax@opensource.cirrus.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: w6xx7tPtpA7FU_dWuxWMA2-30RFpi6DB X-Proofpoint-GUID: w6xx7tPtpA7FU_dWuxWMA2-30RFpi6DB X-Proofpoint-Spam-Reason: safe X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788985227510494441 X-GMAIL-MSGID: 1788985227510494441 Including some missing headers. Suggested-by: Andy Shevchenko Signed-off-by: Charles Keepax Acked-by: Mark Brown --- The changes to the MFD headers necessitate the inclusion of of.h here to keep things building, hence my including this SPI change in the this MFD series. The rest of the SPI fixups will be sent separately, as they are also not dependent on this change. Thanks, Charles drivers/spi/spi-cs42l43.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spi-cs42l43.c b/drivers/spi/spi-cs42l43.c index d239fc5a49ccc..fb62807fc991c 100644 --- a/drivers/spi/spi-cs42l43.c +++ b/drivers/spi/spi-cs42l43.c @@ -11,7 +11,9 @@ #include #include #include +#include #include +#include #include #include #include