| Message ID | 20210202135350.36nj3dmcoq3t7gcf@pengutronix.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [GIT,PULL] immutable branch for amba changes targeting v5.12-rc1 | expand |
Hello, On Tue, Feb 02, 2021 at 02:53:50PM +0100, Uwe Kleine-König wrote: > the following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e: > > Linux 5.11-rc1 (2020-12-27 15:30:22 -0800) > > are available in the Git repository at: > > https://git.pengutronix.de/git/ukl/linux tags/amba-make-remove-return-void > > for you to fetch changes up to f170b59fedd733b92f58c4d7c8357fbf7601d623: > > amba: Make use of bus_type functions (2021-02-02 14:26:02 +0100) > > I expect this tag to be merged by Russell King as amba maintainer and by > Mathieu Poirier (or Greg Kroah-Hartman?) for coresight as there are some > pending conflicting changes. These are not hard to resolve but also > non-trivial. Tell me if you need assistance for resolving, also if it's only a > second pair of eyes to judge your resolution. Alternatively to my additional patch sent earlier today I prepared a v2 tag at https://git.pengutronix.de/git/ukl/linux tags/amba-make-remove-return-void-v2 with the build fix squashed in. Iff you prefer and both Russell and Greg agree to pull this one instead of the (implicit) v1 we can maybe prevent introducing this build regression in mainline. Please coordinate among you two. And sorry again for breaking the build. Best regards Uwe PS: The range-diff between the original tags/amba-make-remove-return-void and tags/amba-make-remove-return-void-v2 is: 1: 3fd269e74f2f ! 1: 481963c91284 amba: Make the remove callback return void @@ Commit message Acked-by: Vladimir Zapolskiy <vz@mleia.com> # for memory/pl172 Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20210126165835.687514-5-u.kleine-koenig@pengutronix.de + [ukleinek: squashed in a build fix for drivers/mailbox/arm_mhuv2.c] Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> ## drivers/amba/bus.c ## @@ drivers/input/serio/ambakmi.c: static int amba_kmi_remove(struct amba_device *de static int __maybe_unused amba_kmi_resume(struct device *dev) + ## drivers/mailbox/arm_mhuv2.c ## +@@ drivers/mailbox/arm_mhuv2.c: static int mhuv2_probe(struct amba_device *adev, const struct amba_id *id) + return ret; + } + +-static int mhuv2_remove(struct amba_device *adev) ++static void mhuv2_remove(struct amba_device *adev) + { + struct mhuv2 *mhu = amba_get_drvdata(adev); + + if (mhu->frame == SENDER_FRAME) + writel_relaxed(0x0, &mhu->send->access_request); +- +- return 0; + } + + static struct amba_id mhuv2_ids[] = { + ## drivers/memory/pl172.c ## @@ drivers/memory/pl172.c: static int pl172_probe(struct amba_device *adev, const struct amba_id *id) return ret; 2: f170b59fedd7 = 2: f30d22a7bfab amba: Make use of bus_type functions
Hello, the following changes since commit 5c8fe583cce542aa0b84adc939ce85293de36e5e: Linux 5.11-rc1 (2020-12-27 15:30:22 -0800) are available in the Git repository at: https://git.pengutronix.de/git/ukl/linux tags/amba-make-remove-return-void for you to fetch changes up to f170b59fedd733b92f58c4d7c8357fbf7601d623: amba: Make use of bus_type functions (2021-02-02 14:26:02 +0100) I expect this tag to be merged by Russell King as amba maintainer and by Mathieu Poirier (or Greg Kroah-Hartman?) for coresight as there are some pending conflicting changes. These are not hard to resolve but also non-trivial. Tell me if you need assistance for resolving, also if it's only a second pair of eyes to judge your resolution. Best regards, Uwe ---------------------------------------------------------------- Tag for adaptions to struct amba_driver::remove changing prototype ---------------------------------------------------------------- Uwe Kleine-König (5): amba: Fix resource leak for drivers without .remove amba: reorder functions vfio: platform: simplify device removal amba: Make the remove callback return void amba: Make use of bus_type functions drivers/amba/bus.c | 234 +++++++++++++++++++++++++++++++++------------------------------ drivers/char/hw_random/nomadik-rng.c | 3 +- drivers/dma/pl330.c | 3 +- drivers/gpu/drm/pl111/pl111_drv.c | 4 +- drivers/hwtracing/coresight/coresight-catu.c | 3 +- drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 +- drivers/hwtracing/coresight/coresight-cti-core.c | 4 +- drivers/hwtracing/coresight/coresight-etb10.c | 4 +- drivers/hwtracing/coresight/coresight-etm3x-core.c | 4 +- drivers/hwtracing/coresight/coresight-etm4x-core.c | 4 +- drivers/hwtracing/coresight/coresight-funnel.c | 4 +- drivers/hwtracing/coresight/coresight-replicator.c | 4 +- drivers/hwtracing/coresight/coresight-stm.c | 4 +- drivers/hwtracing/coresight/coresight-tmc-core.c | 4 +- drivers/hwtracing/coresight/coresight-tpiu.c | 4 +- drivers/i2c/busses/i2c-nomadik.c | 4 +- drivers/input/serio/ambakmi.c | 3 +- drivers/memory/pl172.c | 4 +- drivers/memory/pl353-smc.c | 4 +- drivers/mmc/host/mmci.c | 4 +- drivers/rtc/rtc-pl030.c | 4 +- drivers/rtc/rtc-pl031.c | 4 +- drivers/spi/spi-pl022.c | 5 +- drivers/tty/serial/amba-pl010.c | 4 +- drivers/tty/serial/amba-pl011.c | 3 +- drivers/vfio/platform/vfio_amba.c | 15 ++-- drivers/video/fbdev/amba-clcd.c | 4 +- drivers/watchdog/sp805_wdt.c | 4 +- include/linux/amba/bus.h | 2 +- sound/arm/aaci.c | 4 +- 30 files changed, 157 insertions(+), 198 deletions(-)