From: Jeffy Chen <jeffy.chen@rock-chips.com>
To: linux-kernel@vger.kernel.org
Cc: jcliang@chromium.org, robin.murphy@arm.com, xxm@rock-chips.com,
tfiga@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>,
Heiko Stuebner <heiko@sntech.de>,
linux-rockchip@lists.infradead.org,
iommu@lists.linux-foundation.org, Joerg Roedel <joro@8bytes.org>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 02/13] iommu/rockchip: Fix error handling in probe
Date: Wed, 24 Jan 2018 18:35:05 +0800 [thread overview]
Message-ID: <20180124103516.2571-3-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20180124103516.2571-1-jeffy.chen@rock-chips.com>
Add missing iommu_device_sysfs_remove in error path.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/iommu/rockchip-iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 16cd8780c289..c2ef3cbd4401 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1193,8 +1193,12 @@ static int rk_iommu_probe(struct platform_device *pdev)
iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
err = iommu_device_register(&iommu->iommu);
+ if (err) {
+ iommu_device_sysfs_remove(&iommu->iommu);
+ return err;
+ }
- return err;
+ return 0;
}
static const struct of_device_id rk_iommu_dt_ids[] = {
--
2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: jeffy.chen@rock-chips.com (Jeffy Chen)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 02/13] iommu/rockchip: Fix error handling in probe
Date: Wed, 24 Jan 2018 18:35:05 +0800 [thread overview]
Message-ID: <20180124103516.2571-3-jeffy.chen@rock-chips.com> (raw)
In-Reply-To: <20180124103516.2571-1-jeffy.chen@rock-chips.com>
Add missing iommu_device_sysfs_remove in error path.
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
Changes in v5: None
Changes in v4: None
Changes in v3: None
Changes in v2: None
drivers/iommu/rockchip-iommu.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c
index 16cd8780c289..c2ef3cbd4401 100644
--- a/drivers/iommu/rockchip-iommu.c
+++ b/drivers/iommu/rockchip-iommu.c
@@ -1193,8 +1193,12 @@ static int rk_iommu_probe(struct platform_device *pdev)
iommu_device_set_ops(&iommu->iommu, &rk_iommu_ops);
err = iommu_device_register(&iommu->iommu);
+ if (err) {
+ iommu_device_sysfs_remove(&iommu->iommu);
+ return err;
+ }
- return err;
+ return 0;
}
static const struct of_device_id rk_iommu_dt_ids[] = {
--
2.11.0
next prev parent reply other threads:[~2018-01-24 10:35 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-24 10:35 [PATCH v5 00/13] iommu/rockchip: Use OF_IOMMU Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 01/13] iommu/rockchip: Prohibit unbind and remove Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen [this message]
2018-01-24 10:35 ` [PATCH v5 02/13] iommu/rockchip: Fix error handling in probe Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 03/13] iommu/rockchip: Request irqs in rk_iommu_probe() Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 04/13] iommu/rockchip: Fix error handling in attach Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 05/13] iommu/rockchip: Use iopoll helpers to wait for hardware Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 06/13] iommu/rockchip: Fix TLB flush of secondary IOMMUs Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 07/13] ARM: dts: rockchip: add clocks in vop iommu nodes Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 08/13] iommu/rockchip: Control clocks needed to access the IOMMU Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 13:49 ` Robin Murphy
2018-01-24 13:49 ` Robin Murphy
2018-01-26 9:45 ` JeffyChen
2018-01-26 9:45 ` JeffyChen
2018-01-26 9:45 ` JeffyChen
2018-02-14 10:03 ` Vivek Gautam
2018-02-14 10:03 ` Vivek Gautam
2018-02-14 10:03 ` Vivek Gautam
2018-02-14 11:27 ` Tomasz Figa
2018-02-14 11:27 ` Tomasz Figa
2018-02-14 11:27 ` Tomasz Figa via iommu
2018-01-30 17:05 ` Rob Herring
2018-01-30 17:05 ` Rob Herring
2018-01-30 17:05 ` Rob Herring
2018-01-31 7:52 ` Tomasz Figa
2018-01-31 7:52 ` Tomasz Figa
2018-01-31 7:52 ` Tomasz Figa
2018-01-31 13:50 ` Rob Herring
2018-01-31 13:50 ` Rob Herring
2018-01-31 13:50 ` Rob Herring
2018-02-01 11:19 ` JeffyChen
[not found] ` <5A72F7D2.1050201-TNX95d0MmH7DzftRWevZcw@public.gmane.org>
2018-02-23 10:24 ` JeffyChen
2018-02-27 16:59 ` Robin Murphy
2018-02-27 16:59 ` Robin Murphy
2018-02-27 16:59 ` Robin Murphy
2018-02-28 13:00 ` JeffyChen
2018-02-28 13:00 ` JeffyChen
2018-02-28 15:06 ` Robin Murphy
2018-02-28 15:06 ` Robin Murphy
2018-02-28 15:06 ` Robin Murphy
2018-03-01 1:37 ` JeffyChen
2018-03-01 1:37 ` JeffyChen
2018-03-01 1:37 ` JeffyChen
2018-01-24 10:35 ` [PATCH v5 09/13] iommu/rockchip: Use IOMMU device for dma mapping operations Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 10/13] iommu/rockchip: Use OF_IOMMU to attach devices automatically Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 11/13] iommu/rockchip: Fix error handling in init Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 12/13] iommu/rockchip: Add runtime PM support Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` [PATCH v5 13/13] iommu/rockchip: Support sharing IOMMU between masters Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
2018-01-24 10:35 ` Jeffy Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180124103516.2571-3-jeffy.chen@rock-chips.com \
--to=jeffy.chen@rock-chips.com \
--cc=heiko@sntech.de \
--cc=iommu@lists.linux-foundation.org \
--cc=jcliang@chromium.org \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rockchip@lists.infradead.org \
--cc=robin.murphy@arm.com \
--cc=tfiga@chromium.org \
--cc=xxm@rock-chips.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.