Merge tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux

Pull i3c updates from Boris Brezillon:

 - Add a /* fall-through */ comment in the dw-i3c-master driver

 - Update the I3C entries in MAINTAINERS to add an IRC chan

* tag 'i3c/for-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
  i3c: master: dw-i3c-master: mark expected switch fall-through
  MAINTAINERS: Add an IRC channel for the I3C subsystem

diff --combined MAINTAINERS
index b40ec3f4b943862c0fcf9c2161c54f29a733e05d,207352f859342206d26aa3e7cdff27b3d99b4851..f1050734d909d08abd3fd227abd7abdf12c3e29b
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -409,7 -409,8 +409,7 @@@ F: drivers/platform/x86/wmi.
  F:    include/uapi/linux/wmi.h
  
  AD1889 ALSA SOUND DRIVER
 -M:    Thibaut Varene <[email protected]>
 -W:    http://wiki.parisc-linux.org/AD1889
 +W:    https://parisc.wiki.kernel.org/index.php/AD1889
  L:    [email protected]
  S:    Maintained
  F:    sound/pci/ad1889.*
@@@ -2847,11 -2848,8 +2847,11 @@@ F:    include/uapi/linux/if_bonding.
  BPF (Safe dynamic programs and tools)
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
 +R:    Martin KaFai Lau <[email protected]>
 +R:    Song Liu <[email protected]>
 +R:    Yonghong Song <[email protected]>
  L:    [email protected]
 -L:    linux-kernel@vger.kernel.org
 +L:    bpf@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git
  Q:    https://patchwork.ozlabs.org/project/netdev/list/?delegate=77147
@@@ -2875,13 -2873,10 +2875,13 @@@ F:   samples/bpf
  F:    tools/bpf/
  F:    tools/lib/bpf/
  F:    tools/testing/selftests/bpf/
 +K:    bpf
 +N:    bpf
  
  BPF JIT for ARM
  M:    Shubham Bansal <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/arm/net/
  
@@@ -2890,21 -2885,18 +2890,21 @@@ M:   Daniel Borkmann <[email protected]
  M:    Alexei Starovoitov <[email protected]>
  M:    Zi Shen Lim <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    arch/arm64/net/
  
  BPF JIT for MIPS (32-BIT AND 64-BIT)
  M:    Paul Burton <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/mips/net/
  
  BPF JIT for NFP NICs
  M:    Jakub Kicinski <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/netronome/nfp/bpf/
  
@@@ -2912,7 -2904,6 +2912,7 @@@ BPF JIT for POWERPC (32-BIT AND 64-BIT
  M:    Naveen N. Rao <[email protected]>
  M:    Sandipan Das <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/powerpc/net/
  
@@@ -2920,7 -2911,6 +2920,7 @@@ BPF JIT for S39
  M:    Martin Schwidefsky <[email protected]>
  M:    Heiko Carstens <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/s390/net/
  X:    arch/s390/net/pnet.c
@@@ -2928,14 -2918,12 +2928,14 @@@
  BPF JIT for SPARC (32-BIT AND 64-BIT)
  M:    David S. Miller <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/sparc/net/
  
  BPF JIT for X86 32-BIT
  M:    Wang YanQing <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    arch/x86/net/bpf_jit_comp32.c
  
@@@ -2943,7 -2931,6 +2943,7 @@@ BPF JIT for X86 64-BI
  M:    Alexei Starovoitov <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Supported
  F:    arch/x86/net/
  X:    arch/x86/net/bpf_jit_comp32.c
@@@ -3065,8 -3052,8 +3065,8 @@@ F:      include/linux/bcm963xx_nvram.
  F:    include/linux/bcm963xx_tag.h
  
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rasesh.mody@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Rasesh Mody <rmody@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2.*
@@@ -3085,9 -3072,9 +3085,9 @@@ S:      Supporte
  F:    drivers/scsi/bnx2i/
  
  BROADCOM BNX2X 10 GIGABIT ETHERNET DRIVER
 -M:    Ariel Elior <ariel.elior@cavium.com>
 -M:    Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
 -M:    everest-linux-l2@cavium.com
 +M:    Ariel Elior <aelior@marvell.com>
 +M:    Sudarsana Kalluru <skalluru@marvell.com>
 +M:    GR-everest-linux-l2@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/broadcom/bnx2x/
@@@ -3262,9 -3249,9 +3262,9 @@@ S:      Supporte
  F:    drivers/scsi/bfa/
  
  BROCADE BNA 10 GIGABIT ETHERNET DRIVER
 -M:    Rasesh Mody <rasesh.mody@cavium.com>
 -M:    Sudarsana Kalluru <sudarsana.kalluru@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Rasesh Mody <rmody@marvell.com>
 +M:    Sudarsana Kalluru <skalluru@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/brocade/bna/
@@@ -3398,8 -3385,9 +3398,8 @@@ F:      Documentation/media/v4l-drivers/cafe
  F:    drivers/media/platform/marvell-ccic/
  
  CAIF NETWORK LAYER
 -M:    Dmitry Tarnyagin <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Orphan
  F:    Documentation/networking/caif/
  F:    drivers/net/caif/
  F:    include/uapi/linux/caif/
@@@ -3483,9 -3471,10 +3483,9 @@@ F:     drivers/i2c/busses/i2c-octeon
  F:    drivers/i2c/busses/i2c-thunderx*
  
  CAVIUM LIQUIDIO NETWORK DRIVER
 -M:    Derek Chickles <[email protected]>
 -M:    Satanand Burla <[email protected]>
 -M:    Felix Manlunas <[email protected]>
 -M:    Raghu Vatsavayi <[email protected]>
 +M:    Derek Chickles <[email protected]>
 +M:    Satanand Burla <[email protected]>
 +M:    Felix Manlunas <[email protected]>
  L:    [email protected]
  W:    http://www.cavium.com
  S:    Supported
@@@ -3962,7 -3951,7 +3962,7 @@@ L:      [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/ti/cpmac.c
  
 -CPU FREQUENCY DRIVERS
 +CPU FREQUENCY SCALING FRAMEWORK
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Viresh Kumar <[email protected]>
  L:    [email protected]
@@@ -3970,8 -3959,6 +3970,8 @@@ S:      Maintaine
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  T:    git git://git.linaro.org/people/vireshk/linux.git (For ARM Updates)
  B:    https://bugzilla.kernel.org
 +F:    Documentation/admin-guide/pm/cpufreq.rst
 +F:    Documentation/admin-guide/pm/intel_pstate.rst
  F:    Documentation/cpu-freq/
  F:    Documentation/devicetree/bindings/cpufreq/
  F:    drivers/cpufreq/
@@@ -3990,7 -3977,6 +3990,7 @@@ F:      drivers/cpufreq/arm_big_little.
  CPU POWER MONITORING SUBSYSTEM
  M:    Thomas Renninger <[email protected]>
  M:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    tools/power/cpupower/
@@@ -4020,14 -4006,13 +4020,14 @@@ S:   Supporte
  F:    drivers/cpuidle/cpuidle-exynos.c
  F:    arch/arm/mach-exynos/pm.c
  
 -CPUIDLE DRIVERS
 +CPU IDLE TIME MANAGEMENT FRAMEWORK
  M:    "Rafael J. Wysocki" <[email protected]>
  M:    Daniel Lezcano <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  B:    https://bugzilla.kernel.org
 +F:    Documentation/admin-guide/pm/cpuidle.rst
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -5193,7 -5178,7 +5193,7 @@@ DRM DRIVERS FOR XE
  M:    Oleksandr Andrushchenko <[email protected]>
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  L:    [email protected]
 -L:    [email protected].org
 +L:    [email protected]project.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/gpu/drm/xen/
  F:    Documentation/gpu/xen-front.rst
@@@ -6158,7 -6143,7 +6158,7 @@@ FREESCALE SOC SOUND DRIVER
  M:    Timur Tabi <[email protected]>
  M:    Nicolin Chen <[email protected]>
  M:    Xiubo Li <[email protected]>
 -R:    Fabio Estevam <fabio.estevam@nxp.com>
 +R:    Fabio Estevam <festevam@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
@@@ -7176,6 -7161,7 +7176,7 @@@ F:      drivers/i2c/i2c-stub.
  I3C SUBSYSTEM
  M:    Boris Brezillon <[email protected]>
  L:    [email protected]
+ C:    irc://chat.freenode.net/linux-i3c
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-bus-i3c
@@@ -8271,7 -8257,6 +8272,7 @@@ F:      include/uapi/linux/sunrpc
  
  KERNEL SELFTEST FRAMEWORK
  M:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
  L:    [email protected]
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git
  Q:    https://patchwork.kernel.org/project/linux-kselftest/list/
@@@ -8494,7 -8479,6 +8495,7 @@@ L7 BPF FRAMEWOR
  M:    John Fastabend <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    include/linux/skmsg.h
  F:    net/core/skmsg.c
@@@ -9866,13 -9850,6 +9867,13 @@@ F:    drivers/media/platform/meson/ao-cec.
  F:    Documentation/devicetree/bindings/media/meson-ao-cec.txt
  T:    git git://linuxtv.org/media_tree.git
  
 +MESON NAND CONTROLLER DRIVER FOR AMLOGIC SOCS
 +M:    Liang Yang <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/mtd/nand/raw/meson_*
 +F:    Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
 +
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <[email protected]>
  W:    http://www.monstr.eu/fdt/
@@@ -10710,9 -10687,9 +10711,9 @@@ S:   Maintaine
  F:    drivers/net/netdevsim/*
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Manish Chopra <manish.chopra@cavium.com>
 -M:    Rahul Verma <rahul.verma@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Manish Chopra <manishc@marvell.com>
 +M:    Rahul Verma <rahulv@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/netxen/
@@@ -10913,7 -10890,7 +10914,7 @@@ F:   include/linux/nvmem-consumer.
  F:    include/linux/nvmem-provider.h
  
  NXP SGTL5000 DRIVER
 -M:    Fabio Estevam <fabio.estevam@nxp.com>
 +M:    Fabio Estevam <festevam@gmail.com>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/sgtl5000.txt
@@@ -11327,12 -11304,10 +11328,12 @@@ F:        include/dt-bindings
  
  OPENCORES I2C BUS DRIVER
  M:    Peter Korsgaard <[email protected]>
 +M:    Andrew Lunn <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/i2c/busses/i2c-ocores
  F:    drivers/i2c/busses/i2c-ocores.c
 +F:    include/linux/platform_data/i2c-ocores.h
  
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
@@@ -11503,7 -11478,7 +11504,7 @@@ F:   Documentation/blockdev/paride.tx
  F:    drivers/block/paride/
  
  PARISC ARCHITECTURE
 -M:    "James E.J. Bottomley" <[email protected]>
 +M:    "James E.J. Bottomley" <[email protected]>
  M:    Helge Deller <[email protected]>
  L:    [email protected]
  W:    http://www.parisc-linux.org/
@@@ -12498,8 -12473,8 +12499,8 @@@ S:   Supporte
  F:    drivers/scsi/qedi/
  
  QLOGIC QL4xxx ETHERNET DRIVER
 -M:    Ariel Elior <Ariel.Elior@cavium.com>
 -M:    everest-linux-l2@cavium.com
 +M:    Ariel Elior <aelior@marvell.com>
 +M:    GR-everest-linux-l2@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qed/
@@@ -12507,8 -12482,8 +12508,8 @@@ F:   include/linux/qed
  F:    drivers/net/ethernet/qlogic/qede/
  
  QLOGIC QL4xxx RDMA DRIVER
 -M:    Michal Kalderon <Michal.Kalderon@cavium.com>
 -M:    Ariel Elior <Ariel.Elior@cavium.com>
 +M:    Michal Kalderon <mkalderon@marvell.com>
 +M:    Ariel Elior <aelior@marvell.com>
  L:    [email protected]
  S:    Supported
  F:    drivers/infiniband/hw/qedr/
@@@ -12528,7 -12503,7 +12529,7 @@@ F:   Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA3XXX NETWORK DRIVER
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/device_drivers/qlogic/LICENSE.qla3xxx
@@@ -12542,16 -12517,16 +12543,16 @@@ F:        Documentation/scsi/LICENSE.qla4xx
  F:    drivers/scsi/qla4xxx/
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Shahed Shaikh <Shahed.Shaikh@cavium.com>
 -M:    Manish Chopra <manish.chopra@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Shahed Shaikh <shshaikh@marvell.com>
 +M:    Manish Chopra <manishc@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 -M:    Manish Chopra <manish.chopra@cavium.com>
 -M:    Dept-GELinuxNICDev@cavium.com
 +M:    Manish Chopra <manishc@marvell.com>
 +M:    GR-Linux-NIC-Dev@marvell.com
  L:    [email protected]
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlge/
@@@ -12890,13 -12865,6 +12891,13 @@@ F: Documentation/devicetree/bindings/ne
  F:    drivers/net/dsa/realtek-smi*
  F:    drivers/net/dsa/rtl83*
  
 +REDPINE WIRELESS DRIVER
 +M:    Amitkumar Karwar <[email protected]>
 +M:    Siva Rebbagondla <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/wireless/rsi/
 +
  REGISTER MAP ABSTRACTION
  M:    Mark Brown <[email protected]>
  L:    [email protected]
@@@ -13725,15 -13693,6 +13726,15 @@@ L: [email protected]
  S:    Supported
  F:    drivers/net/ethernet/sfc/
  
 +SFF/SFP/SFP+ MODULE SUPPORT
 +M:    Russell King <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/phy/phylink.c
 +F:    drivers/net/phy/sfp*
 +F:    include/linux/phylink.h
 +F:    include/linux/sfp.h
 +
  SGI GRU DRIVER
  M:    Dimitri Sivanich <[email protected]>
  S:    Maintained
@@@ -13862,9 -13821,8 +13863,9 @@@ F:   drivers/media/mmc/siano
  
  SIFIVE DRIVERS
  M:    Palmer Dabbelt <[email protected]>
 +M:    Paul Walmsley <[email protected]>
  L:    [email protected]
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git
 +T:    git git://github.com/sifive/riscv-linux.git
  S:    Supported
  K:    sifive
  N:    sifive
@@@ -14346,7 -14304,6 +14347,7 @@@ F:   arch/arm/mach-spear
  
  SPI NOR SUBSYSTEM
  M:    Marek Vasut <[email protected]>
 +M:    Tudor Ambarus <[email protected]>
  L:    [email protected]
  W:    http://www.linux-mtd.infradead.org/
  Q:    http://patchwork.ozlabs.org/project/linux-mtd/list/
@@@ -14476,11 -14433,6 +14477,11 @@@ M: Florian Schilhabel <florian.c.schilh
  S:    Odd Fixes
  F:    drivers/staging/rtl8712/
  
 +STAGING - REALTEK RTL8188EU DRIVERS
 +M:    Larry Finger <[email protected]>
 +S:    Odd Fixes
 +F:    drivers/staging/rtl8188eu/
 +
  STAGING - SILICON MOTION SM750 FRAME BUFFER DRIVER
  M:    Sudip Mukherjee <[email protected]>
  M:    Teddy Wang <[email protected]>
@@@ -15851,6 -15803,7 +15852,6 @@@ M:   Alan Stern <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -W:    http://www.one-eyed-alien.net/~mdharm/linux-usb/
  F:    drivers/usb/storage/
  
  USB MIDI DRIVER
@@@ -15882,7 -15835,6 +15883,7 @@@ F:   drivers/usb/common/usb-otg-fsm.
  USB OVER IP DRIVER
  M:    Valentina Manea <[email protected]>
  M:    Shuah Khan <[email protected]>
 +M:    Shuah Khan <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/usb/usbip_protocol.txt
@@@ -16680,15 -16632,6 +16681,15 @@@ S: Maintaine
  F:    drivers/platform/x86/
  F:    drivers/platform/olpc/
  
 +X86 PLATFORM DRIVERS - ARCH
 +R:    Darren Hart <[email protected]>
 +R:    Andy Shevchenko <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/core
 +S:    Maintained
 +F:    arch/x86/platform
 +
  X86 VDSO
  M:    Andy Lutomirski <[email protected]>
  L:    [email protected]
@@@ -16721,30 -16664,10 +16722,30 @@@ T:        git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tuner-xc2028.*
  
 +XDP (eXpress Data Path)
 +M:    Alexei Starovoitov <[email protected]>
 +M:    Daniel Borkmann <[email protected]>
 +M:    David S. Miller <[email protected]>
 +M:    Jakub Kicinski <[email protected]>
 +M:    Jesper Dangaard Brouer <[email protected]>
 +M:    John Fastabend <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    net/core/xdp.c
 +F:    include/net/xdp.h
 +F:    kernel/bpf/devmap.c
 +F:    kernel/bpf/cpumap.c
 +F:    include/trace/events/xdp.h
 +K:    xdp
 +N:    xdp
 +
  XDP SOCKETS (AF_XDP)
  M:    Björn Töpel <[email protected]>
  M:    Magnus Karlsson <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  S:    Maintained
  F:    kernel/bpf/xskmap.c
  F:    net/xdp/

diff --combined drivers/i3c/master/dw-i3c-master.c
index bb03079fbade164806047e17aa697c0f886bd5b0,d1b32a93ef543f130411a75d295bbe10cd777eea..59279224e07fcefa460b1939212a5009eb8a3681
--- 1/drivers/i3c/master/dw-i3c-master.c
--- 2/drivers/i3c/master/dw-i3c-master.c
+++ b/drivers/i3c/master/dw-i3c-master.c
@@@ -419,9 -419,12 +419,9 @@@ static void dw_i3c_master_enqueue_xfer(
        spin_unlock_irqrestore(&master->xferqueue.lock, flags);
  }
  
 -static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master,
 -                                     struct dw_i3c_xfer *xfer)
 +static void dw_i3c_master_dequeue_xfer_locked(struct dw_i3c_master *master,
 +                                            struct dw_i3c_xfer *xfer)
  {
 -      unsigned long flags;
 -
 -      spin_lock_irqsave(&master->xferqueue.lock, flags);
        if (master->xferqueue.cur == xfer) {
                u32 status;
  
@@@ -436,15 -439,6 +436,15 @@@
        } else {
                list_del_init(&xfer->node);
        }
 +}
 +
 +static void dw_i3c_master_dequeue_xfer(struct dw_i3c_master *master,
 +                                     struct dw_i3c_xfer *xfer)
 +{
 +      unsigned long flags;
 +
 +      spin_lock_irqsave(&master->xferqueue.lock, flags);
 +      dw_i3c_master_dequeue_xfer_locked(master, xfer);
        spin_unlock_irqrestore(&master->xferqueue.lock, flags);
  }
  
@@@ -500,7 -494,7 +500,7 @@@ static void dw_i3c_master_end_xfer_lock
        complete(&xfer->comp);
  
        if (ret < 0) {
 -              dw_i3c_master_dequeue_xfer(master, xfer);
 +              dw_i3c_master_dequeue_xfer_locked(master, xfer);
                writel(readl(master->regs + DEVICE_CTRL) | DEV_CTRL_RESUME,
                       master->regs + DEVICE_CTRL);
        }
@@@ -602,6 -596,7 +602,7 @@@ static int dw_i3c_master_bus_init(struc
                ret = dw_i2c_clk_cfg(master);
                if (ret)
                        return ret;
+               /* fall through */
        case I3C_BUS_MODE_PURE:
                ret = dw_i3c_clk_cfg(master);
                if (ret)
@@@ -907,6 -902,9 +908,6 @@@ static int dw_i3c_master_reattach_i3c_d
               master->regs +
               DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));
  
 -      if (!old_dyn_addr)
 -              return 0;
 -
        master->addrs[data->index] = dev->info.dyn_addr;
  
        return 0;
@@@ -928,11 -926,11 +929,11 @@@ static int dw_i3c_master_attach_i3c_dev
                return -ENOMEM;
  
        data->index = pos;
 -      master->addrs[pos] = dev->info.dyn_addr;
 +      master->addrs[pos] = dev->info.dyn_addr ? : dev->info.static_addr;
        master->free_pos &= ~BIT(pos);
        i3c_dev_set_master_data(dev, data);
  
 -      writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(dev->info.dyn_addr),
 +      writel(DEV_ADDR_TABLE_DYNAMIC_ADDR(master->addrs[pos]),
               master->regs +
               DEV_ADDR_TABLE_LOC(master->datstartaddr, data->index));