From nobody Wed Dec 17 16:14:14 2025 Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) (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 DAB1884D29 for ; Mon, 9 Dec 2024 16:05:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733760307; cv=none; b=CJ1TzAFi1WLpXw3s5IWBKGUC5oaVHJCeMMMc8ob52oMgSp6NtAgThiwCb0mEYlN/GQQ7oKzS14W+dxZQMU8CeHwtaueTKoRKc9/ktMIE6MaMrfTtICmbTjDzlxY7rvfSFuzKnuJVLzpk7s5ecQszCVHop5iZvgDc+er+XZ9PDFY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733760307; c=relaxed/simple; bh=GIzXS2CMipBruUg013x80hnunrhkIkK1Hy8qrpszX8M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lvrjDb9+8lv0SSloilXnSSF+83k7yPYMLA+H70R9w6J6GGUnu+K2Kp+4gHnuyX37Xwo/fTmdzoZvrAz+FWCtwoxGZ6b9jgDWqB8CfKjor0ZUjuWvCTs9gMxrKSKbBS7ij3nN+1U3ptVmnBYrpVwNnOFGAN5TMXb1DvYiSLDi4zI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=nKcrOlRO; arc=none smtp.client-ip=209.85.128.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="nKcrOlRO" Received: by mail-wm1-f47.google.com with SMTP id 5b1f17b1804b1-4349f160d62so30416025e9.2 for ; Mon, 09 Dec 2024 08:05:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1733760303; x=1734365103; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=idjswr3CZVaGYQninP+vbzfJuDUomFBTKvCN0oZEZio=; b=nKcrOlRO2DA/TrVXmxLcDR2AubyhASN90gogsHsPukEGqSUwmT+10lq2kTGC9047G1 hh0qtVXzgma+0301fvfGWweCyJFI5RWs7/iLXhGcfiklnVtK26S9D8DXFzYWC7p2AdP0 Lu7vOa47BrpIRBVS8GGTDa/k3c2vwfVcoGB4vyTG1J4lgE7tKcbxXcRsfdbDTAXvdmeG 3fjavh+E8TcO541bzJtQmFRe1nglHAYC0voozNiyb4iG6GR4oHAbELZrt8AMlqqKtmb2 YxFE7So3TnFBsXyDXwWkb+ka9jVUwRMnbqFwEVOqXSGcAw2Q8dW9unRdIYREH8HrHJZx U2qA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733760303; x=1734365103; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=idjswr3CZVaGYQninP+vbzfJuDUomFBTKvCN0oZEZio=; b=nTBZKxONNaqBA0NLalo/XLRMlO0xVR1zk973k/BEYfHD6L4sQUF0WrABfJRqV4sbUw ux/c3e1+loORtyJRC+NN9bg9SwLNVAQROFJn/RaKTbXDhsVUZRUzU5j33R4kTZpRvd8e lOHphN9zS2PTJaM6lf1Bf9uyU/gBHMvfQJsug0RisGjBTGiE5iisU5piKVwZTnxl3HDW Np11HEi5bAQXKQAXyINM8c9kSHnkvfXwdwxCs57p+czIGqulpq+do1PQkj10GqCivEoc 4TC284O78sPpPW3CRagm9cefbAy6jlyo4aUO3OeR9iWeQK2cVPzojyzwtBTEiL4iMx4K LC7A== X-Forwarded-Encrypted: i=1; AJvYcCWRX+QTPUVwsvAsVX/bmV6ObPhSS+UYXfe4Jt/th00XLYevmhEdVOWIS5HBYy0+oxjNJXe7P19c5qk3MLs=@vger.kernel.org X-Gm-Message-State: AOJu0YxS8YIn3TE3NH//pg2Nz6F7i8L45+QvzA2mMlzCYKNHmGMIJRKb 9Lk040XO2yU6XZbBa0fgcVKhmzZQUYEZW1fMpgH+Go8vYsIKYi4soE6dRktOUb4= X-Gm-Gg: ASbGncvSNxYOnb2vGIayJNQPpTvNubGqxxnPZ6eGr7jGXZfuguf8K/f5Mn00hxidpNV 4ilJ1YBsU9tChxWRg0wtkihJThLUVzd0oL/lkIDW3o8mSX3dKt0PJebR07BpM7vy3m9Gfu0KZTY Or4jXH6MhBYfWea9zPPVcoNtYEmimtdqFOBYx7+XnwJMiBGagRPLukVl3wf1Z4NhvnUR9exGI/U kgZjgsRWWozAerCV+fZjm8eYpOsSJcaOQxueVlqnXckxvowN8/sMZPoThJ+Nwpm X-Google-Smtp-Source: AGHT+IFxmJwOIZdSDCITBs7oFnEjBxY6Amfn6FoL8IA0PX5snnp8jJg+2IGwONPosv/ODGNfFL0F5w== X-Received: by 2002:a05:600c:1d12:b0:432:d797:404a with SMTP id 5b1f17b1804b1-434fffa2ad1mr8902035e9.22.1733760303044; Mon, 09 Dec 2024 08:05:03 -0800 (PST) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:432b:3c3e:b17a:687a]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-434f3d89b75sm61459015e9.15.2024.12.09.08.05.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 08:05:02 -0800 (PST) From: Jerome Brunet Date: Mon, 09 Dec 2024 17:04:34 +0100 Subject: [PATCH 1/2] reset: amlogic: aux: get regmap through parent device Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241209-meson-rst-aux-rework-v1-1-d2afb69cc72e@baylibre.com> References: <20241209-meson-rst-aux-rework-v1-0-d2afb69cc72e@baylibre.com> In-Reply-To: <20241209-meson-rst-aux-rework-v1-0-d2afb69cc72e@baylibre.com> To: Philipp Zabel , Neil Armstrong , Kevin Hilman , Martin Blumenstingl , Jiucheng Xu , Stephen Boyd , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2997; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=GIzXS2CMipBruUg013x80hnunrhkIkK1Hy8qrpszX8M=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBnVxUrYW638WrIiCr42AH4JqorjA4A+TLUZqfdJ 0cE5/fWf0iJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCZ1cVKwAKCRDm/A8cN/La hT1WD/wJ6B/JrH/0Q+H6hMUfb52yQg381BFefDiZ+hYlFFSL2G/5ELCs7skolU4LuewUJ4kYYlO 73Lgt1ujDqW6CJhhdzDCeqqMXrPuXjX5OHdcP9uB78toj45dBkSJPwSiALZORP4IMCg1gehyy1E 6sBd0VUvAjT1b3abHb/tDmDrdY5O381LR7/eQvWquiXl1Q9YoamWtXsnoQO4BO6oHzXXtUxNjs7 d8g3SFiIUSkz/tB+ruYtiOhYJeOAeUA/uaAp4ViGHyIgHvE/U8a2wX4C6wpWRfuHgce0Q6IxQSA nWGCU5bWf5oAQ/GNrEC/0EPKPWzgrqwIcq0Wbxj/W+FgAL9ckUa/USHn+xtYLRcGpFGCN/2DAlL IoCifTNiA5iVmZVveeFhRqvLpzN30iRltEkRI+Oqf9Rtn5v3uyU7mCUPbmMkiTaTuMTyLxB3YPu IHTFzpqaH8FxnEDAkUsA6TKPO6lfL9Rucz5qm55Nw7Hs36IzonVAwwoVjwYwfgQUkibZ9EJYkvQ C2PhkeHy+5dM5CDNfRpaIaGCDBE/ISd8HMpJiYJdsoZ19Ln+bGCGZa8MeX2fAY1mr/wqjghxnJ5 TVLHtTxaXfyFoPDzbllL9HKjCAdU+64YDXCeDPxh53FLzWyWkGsQ48kVQ+WTRIp4Art0Z6r9kN2 IAt5sbbUECe72WQ== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 Get regmap directly from the parent device registering the auxiliary reset driver, instead of using device data attached to the auxiliary device. This simplifies the registration a bit. Suggested-by: Stephen Boyd Signed-off-by: Jerome Brunet Acked-by: Arnd Bergmann --- drivers/reset/amlogic/reset-meson-aux.c | 36 +++++++++++------------------= ---- 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/drivers/reset/amlogic/reset-meson-aux.c b/drivers/reset/amlogi= c/reset-meson-aux.c index 4b422ae5fcd209e1041e9a793d980627203d00b0..0fc1788eb7a83810ac524facfe0= 9b5fa032573c3 100644 --- a/drivers/reset/amlogic/reset-meson-aux.c +++ b/drivers/reset/amlogic/reset-meson-aux.c @@ -18,14 +18,6 @@ =20 static DEFINE_IDA(meson_rst_aux_ida); =20 -struct meson_reset_adev { - struct auxiliary_device adev; - struct regmap *map; -}; - -#define to_meson_reset_adev(_adev) \ - container_of((_adev), struct meson_reset_adev, adev) - static const struct meson_reset_param meson_a1_audio_param =3D { .reset_ops =3D &meson_reset_toggle_ops, .reset_num =3D 32, @@ -72,10 +64,13 @@ static int meson_reset_aux_probe(struct auxiliary_devic= e *adev, { const struct meson_reset_param *param =3D (const struct meson_reset_param *)(id->driver_data); - struct meson_reset_adev *raux =3D - to_meson_reset_adev(adev); + struct regmap *map; + + map =3D dev_get_regmap(adev->dev.parent, NULL); + if (!map) + return -EINVAL; =20 - return meson_reset_controller_register(&adev->dev, raux->map, param); + return meson_reset_controller_register(&adev->dev, map, param); } =20 static struct auxiliary_driver meson_reset_aux_driver =3D { @@ -87,11 +82,9 @@ module_auxiliary_driver(meson_reset_aux_driver); static void meson_rst_aux_release(struct device *dev) { struct auxiliary_device *adev =3D to_auxiliary_dev(dev); - struct meson_reset_adev *raux =3D - to_meson_reset_adev(adev); =20 ida_free(&meson_rst_aux_ida, adev->id); - kfree(raux); + kfree(adev); } =20 static void meson_rst_aux_unregister_adev(void *_adev) @@ -103,24 +96,19 @@ static void meson_rst_aux_unregister_adev(void *_adev) } =20 int devm_meson_rst_aux_register(struct device *dev, - struct regmap *map, const char *adev_name) { - struct meson_reset_adev *raux; struct auxiliary_device *adev; int ret; =20 - raux =3D kzalloc(sizeof(*raux), GFP_KERNEL); - if (!raux) + adev =3D kzalloc(sizeof(*adev), GFP_KERNEL); + if (!adev) return -ENOMEM; =20 ret =3D ida_alloc(&meson_rst_aux_ida, GFP_KERNEL); if (ret < 0) - goto raux_free; - - raux->map =3D map; + goto adev_free; =20 - adev =3D &raux->adev; adev->id =3D ret; adev->name =3D adev_name; adev->dev.parent =3D dev; @@ -142,8 +130,8 @@ int devm_meson_rst_aux_register(struct device *dev, =20 ida_free: ida_free(&meson_rst_aux_ida, adev->id); -raux_free: - kfree(raux); +adev_free: + kfree(adev); return ret; } EXPORT_SYMBOL_GPL(devm_meson_rst_aux_register); --=20 2.45.2 From nobody Wed Dec 17 16:14:14 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 4433913790B for ; Mon, 9 Dec 2024 16:05:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733760309; cv=none; b=BVkCUGRf6tSXQl6EjFNw3kEnTv4dmLE88SAftPbI6rn5Jm4sDGbuWJAwwlL97WkD3c2OPW5s6JBZ2Ez1IFEldXorPNmsUZxUM46njZbDL0lrqsNXafVLb0QrzYevquJeWpk5nxXWeQkZPuFun6Naf8+9Q/lM9rOYrxFc/uFFrt4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733760309; c=relaxed/simple; bh=rBR5NXgnww06Sh65Qy/7Azyi2Gb2xpN2qKRXGKxDmUQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lXgYxRBH1T8vYusOxO+5cdcVkYafSlCf29LLsYEyglLvssaScJ3V3EDPlWB3tKZr/+f3Tb1es4HAWiZS1eO6uzzQqpP2kJanu5CjwTeIBOkB+sgKhAoK//k8IGQrITnkwwjfEcAp434Smn48RgBCghbKWOls2Dvwy22pCi2xaeE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=yRWiI76Y; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="yRWiI76Y" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-434a1833367so26815685e9.1 for ; Mon, 09 Dec 2024 08:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1733760305; x=1734365105; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=6gQvn01SCFaYf85wm7wZA4AxrI1YMc0NMUI8LVKIi7Q=; b=yRWiI76Y+7z17ROxkMTmxCak6nxEQ9yyM4w5+2zhAvWV81EzI8Mxk8jio7xgXpa3OT 8wpYck0Pd3XOzfRWAsr+Z/iglNmvJlAmlw3v7zzGvqpM4xOoWEU8jO3wJ0To4My6Vy9H xNVbZu5uexo2IbnYCVmTsm8lx0tbpVf+Kd2EVotg66KwZAiHGsC0FGuUCqctycQA/t46 hKDZmhOWfpk9hkWozF/vF3cydQoSXbYqtvRueQe5iGSdl0XeS/WE5maiVzbRG8OHMzad 4zKzXgvklIPbXqJ7JcTXEWCox3EXVhhcDj3X0s1edbJSX7s1DVKg7CBKRFQq3pxo9RuN QErA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733760305; x=1734365105; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6gQvn01SCFaYf85wm7wZA4AxrI1YMc0NMUI8LVKIi7Q=; b=O2EYZfxICKaMB6+y0QO0dY2e7RO0xMiw/yDgoFHWRRqgsDeCfWERLUdCgYgtzFs/vk Oxivy0QmnfPK5K1gdg8k7W+/P//AJjpZg6r09dhK9Cdm0SiSzVQ56gipLInsRPabxzVJ CXRo/ZO7LW2Fr/Jgwq21PgSULFnTRUJMMAw6LynyLmOTxBD4iI7OQdhzXQTKJ6fUMLHZ Ceov+3SGBL0Hzs7oPaCxjqVz/8qeJght0+Rw9lpagy07sFdx+lQR35aQGMvxzaOlOQkt i2eUwR0CD49LbPLvpnMkXUrSpf8cZMGOO3/R06ARm8K9B0zZlhlUmRY2zJfyLUF3P77l xALg== X-Forwarded-Encrypted: i=1; AJvYcCUCXZwTL+avlw4YGykFPIpPcG4azg8zUCX9Zv3FDGFYCrvP0sfPBUX7YfLRGhuNWdcoWllGIu3cr8jl+b4=@vger.kernel.org X-Gm-Message-State: AOJu0YwFPGsWc8HdFlW94+ChFemu1SiTr5PFT0+n0glxiYCvY1KIkN6E XxtqFm0TpjJUluBLK8DhUxFtzzsDf32IApLJxesCq6N9aDl+kIaz1nDkuHEJyD8= X-Gm-Gg: ASbGncvqZfAPHaHD8ssqYx1rIMrE0ydbsiSHZkt1S2+ki3XNVduuSwRSpz2AaLvldEF JdV+7/IlTII1gmKpriVgL5PDmZJs5wOpUbTHZc4VI9QXKd6FEapkYoPIl8YoqrjCaCtgJK9ZXN/ olrjUxyaPLTVHjPaSlI9sU3DZZuEzlsIYa8MC+fiIXRWc8Bxy+q86Z8h6EBMxz0Aznv3fCK8Gm7 tBewAm68XFR8CbtkC/CnDiSbn6X5XH6y/LkX59FzuDGV1EvBTlsrVt8MNvr2NAx X-Google-Smtp-Source: AGHT+IFLgrvvJ4ZbcU5oZ15CP6sGt89w7sS5cZEiwVmnaeCinGDbdxMMBd+lkWhnwgPAIvZ9epw2HA== X-Received: by 2002:a05:600c:3659:b0:434:e65e:457b with SMTP id 5b1f17b1804b1-434e65e47cbmr71087645e9.3.1733760303838; Mon, 09 Dec 2024 08:05:03 -0800 (PST) Received: from toaster.baylibre.com ([2a01:e0a:3c5:5fb1:432b:3c3e:b17a:687a]) by smtp.googlemail.com with ESMTPSA id 5b1f17b1804b1-434f3d89b75sm61459015e9.15.2024.12.09.08.05.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Dec 2024 08:05:03 -0800 (PST) From: Jerome Brunet Date: Mon, 09 Dec 2024 17:04:35 +0100 Subject: [PATCH 2/2] reset: amlogic: aux: drop aux registration helper Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20241209-meson-rst-aux-rework-v1-2-d2afb69cc72e@baylibre.com> References: <20241209-meson-rst-aux-rework-v1-0-d2afb69cc72e@baylibre.com> In-Reply-To: <20241209-meson-rst-aux-rework-v1-0-d2afb69cc72e@baylibre.com> To: Philipp Zabel , Neil Armstrong , Kevin Hilman , Martin Blumenstingl , Jiucheng Xu , Stephen Boyd , Arnd Bergmann Cc: linux-arm-kernel@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org, Jerome Brunet X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3766; i=jbrunet@baylibre.com; h=from:subject:message-id; bh=rBR5NXgnww06Sh65Qy/7Azyi2Gb2xpN2qKRXGKxDmUQ=; b=owEBbQKS/ZANAwAKAeb8Dxw38tqFAcsmYgBnVxUsYkSkA4Qwt3VALxgGbnvIVc8tf8kC27Tdj dF6gxpmN7iJAjMEAAEKAB0WIQT04VmuGPP1bV8btxvm/A8cN/LahQUCZ1cVLAAKCRDm/A8cN/La hYLDEACeLDq6gapWnzc/DY38UK33183muDLmS35DUORGdkyly9YR8SSsNCdgUThmQj7ZGrECxOr VACnCXVFGcdnQk+SJhg/x2a/y5Bvh/kJYH5RNDcLWYAlXyCsYKw6GAnPc1q8cZ+0oEiRiQTvF4O eVRLt8oFMXOpgSzceSZ/AXAEaPRsUa1yVGih6LQp802v+sp6x2SJK7kvpkyIL8AHKhuoAbLz8uH mxYYi3OajcQM4B/Z0secKuabppMS1DfMB4JsKpbRDRGlaa4oa0MWjiULPBbXd5lAsPxDk6WFx3d PhpbjYQCF9wXXCAJtPXcDWKidypQ6D56IfoP+OfGNw/4Idw3of+1fSebpIUrL4lcReeCNWNU7A+ nctX/aQ4/FSHYW8aPvKP1yj/1u6gVl5o0Z2tdPyTktiGYncfHhSuk7KYRlsAPzADVKOJ41zFRYD yPhUJU0YZFwbYh6AK3l9/1a8PgEC5gWWJpTw7laTHX3QIBMQuUcBCKNADgz39Y0BmGBnCrHd0T0 6TxWvh+RG7mHc+3uAgpv7kcqt6UDYuwJYGf8kwCW5wB2rcfo+mPaaDHHH/lcOvmSdMR11ORdf8L IYVtcVu0rMsV7LJWl4snnxIw97Vnyf1hda505G5SAVkM3q2AR/XRU/UsSfs9JyMVMz6k0VyBp6j +h15x7Daa+PgfKg== X-Developer-Key: i=jbrunet@baylibre.com; a=openpgp; fpr=F29F26CF27BAE1A9719AE6BDC3C92AAF3E60AED9 Having the aux registration helper along with the registered driver is not great dependency wise. It does not allow the registering driver to be properly decoupled from the registered auxiliary driver. Drop the registration helper from the amlogic auxiliary reset driver. This will be handled in the registering clock driver to start with while a more generic solution is worked on. Suggested-by: Arnd Bergmann Signed-off-by: Jerome Brunet Acked-by: Arnd Bergmann --- drivers/reset/amlogic/reset-meson-aux.c | 61 -----------------------------= ---- include/soc/amlogic/reset-meson-aux.h | 23 ------------- 2 files changed, 84 deletions(-) diff --git a/drivers/reset/amlogic/reset-meson-aux.c b/drivers/reset/amlogi= c/reset-meson-aux.c index 0fc1788eb7a83810ac524facfe09b5fa032573c3..1a2024afa056ea4d9404f644447= 6e48265ac8da4 100644 --- a/drivers/reset/amlogic/reset-meson-aux.c +++ b/drivers/reset/amlogic/reset-meson-aux.c @@ -11,12 +11,8 @@ #include #include #include -#include =20 #include "reset-meson.h" -#include - -static DEFINE_IDA(meson_rst_aux_ida); =20 static const struct meson_reset_param meson_a1_audio_param =3D { .reset_ops =3D &meson_reset_toggle_ops, @@ -79,63 +75,6 @@ static struct auxiliary_driver meson_reset_aux_driver = =3D { }; module_auxiliary_driver(meson_reset_aux_driver); =20 -static void meson_rst_aux_release(struct device *dev) -{ - struct auxiliary_device *adev =3D to_auxiliary_dev(dev); - - ida_free(&meson_rst_aux_ida, adev->id); - kfree(adev); -} - -static void meson_rst_aux_unregister_adev(void *_adev) -{ - struct auxiliary_device *adev =3D _adev; - - auxiliary_device_delete(adev); - auxiliary_device_uninit(adev); -} - -int devm_meson_rst_aux_register(struct device *dev, - const char *adev_name) -{ - struct auxiliary_device *adev; - int ret; - - adev =3D kzalloc(sizeof(*adev), GFP_KERNEL); - if (!adev) - return -ENOMEM; - - ret =3D ida_alloc(&meson_rst_aux_ida, GFP_KERNEL); - if (ret < 0) - goto adev_free; - - adev->id =3D ret; - adev->name =3D adev_name; - adev->dev.parent =3D dev; - adev->dev.release =3D meson_rst_aux_release; - device_set_of_node_from_dev(&adev->dev, dev); - - ret =3D auxiliary_device_init(adev); - if (ret) - goto ida_free; - - ret =3D __auxiliary_device_add(adev, dev->driver->name); - if (ret) { - auxiliary_device_uninit(adev); - return ret; - } - - return devm_add_action_or_reset(dev, meson_rst_aux_unregister_adev, - adev); - -ida_free: - ida_free(&meson_rst_aux_ida, adev->id); -adev_free: - kfree(adev); - return ret; -} -EXPORT_SYMBOL_GPL(devm_meson_rst_aux_register); - MODULE_DESCRIPTION("Amlogic Meson Reset Auxiliary driver"); MODULE_AUTHOR("Jerome Brunet "); MODULE_LICENSE("Dual BSD/GPL"); diff --git a/include/soc/amlogic/reset-meson-aux.h b/include/soc/amlogic/re= set-meson-aux.h deleted file mode 100644 index d8a15d48c98494c45c6e3d7e88fa714f770f12e3..000000000000000000000000000= 0000000000000 --- a/include/soc/amlogic/reset-meson-aux.h +++ /dev/null @@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SOC_RESET_MESON_AUX_H -#define __SOC_RESET_MESON_AUX_H - -#include - -struct device; -struct regmap; - -#if IS_ENABLED(CONFIG_RESET_MESON_AUX) -int devm_meson_rst_aux_register(struct device *dev, - struct regmap *map, - const char *adev_name); -#else -static inline int devm_meson_rst_aux_register(struct device *dev, - struct regmap *map, - const char *adev_name) -{ - return 0; -} -#endif - -#endif /* __SOC_RESET_MESON_AUX_H */ --=20 2.45.2