diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-06-27 22:54:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-06-27 22:54:34 +0200 |
| commit | 356fa4975950d48d12b6ee9f9050ad429db25852 (patch) | |
| tree | 9602a5f645c9951401a74d152b5f865ddb1e1c15 /drivers/soc | |
| parent | 3f711c249032fee954e92e4d04c8cd2744994291 (diff) | |
| parent | fb9c384625dd604e8a5be1f42b35e83104b90670 (diff) | |
| download | linux-stable-356fa4975950d48d12b6ee9f9050ad429db25852.tar.gz linux-stable-356fa4975950d48d12b6ee9f9050ad429db25852.tar.bz2 linux-stable-356fa4975950d48d12b6ee9f9050ad429db25852.zip | |
Merge tag 'soc-fsl-next-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux into soc/drivers
NXP/FSL SoC driver updates for v6.5
- fsl-mc: Make remove function return void
- QE USB: fix build issue caused by missing dependency
* tag 'soc-fsl-next-v6.5' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux:
bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable
bus: fsl-mc: fsl-mc-allocator: Initialize mc_bus_dev before use
soc/fsl/qe: fix usb.c build errors
bus: fsl-mc: Make remove function return void
soc: fsl: dpio: Suppress duplicated error reporting on device remove
bus: fsl-mc: fsl-mc-allocator: Improve error reporting
bus: fsl-mc: fsl-mc-allocator: Drop if block with always wrong condition
bus: fsl-mc: dprc: Push down error message from fsl_mc_driver_remove()
bus: fsl-mc: Only warn once about errors on device unbind
Link: https://lore.kernel.org/r/20230621222503.12402-1-leoyang.li@nxp.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/fsl/dpio/dpio-driver.c | 8 | ||||
| -rw-r--r-- | drivers/soc/fsl/qe/Kconfig | 1 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/soc/fsl/dpio/dpio-driver.c b/drivers/soc/fsl/dpio/dpio-driver.c index 74eace3109a1..9e3fddd8f5a9 100644 --- a/drivers/soc/fsl/dpio/dpio-driver.c +++ b/drivers/soc/fsl/dpio/dpio-driver.c @@ -270,7 +270,7 @@ static void dpio_teardown_irqs(struct fsl_mc_device *dpio_dev) fsl_mc_free_irqs(dpio_dev); } -static int dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev) +static void dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev) { struct device *dev; struct dpio_priv *priv; @@ -297,14 +297,8 @@ static int dpaa2_dpio_remove(struct fsl_mc_device *dpio_dev) dpio_close(dpio_dev->mc_io, 0, dpio_dev->mc_handle); - fsl_mc_portal_free(dpio_dev->mc_io); - - return 0; - err_open: fsl_mc_portal_free(dpio_dev->mc_io); - - return err; } static const struct fsl_mc_device_id dpaa2_dpio_match_id_table[] = { diff --git a/drivers/soc/fsl/qe/Kconfig b/drivers/soc/fsl/qe/Kconfig index 7268c2fbcbc1..160c8877b0c9 100644 --- a/drivers/soc/fsl/qe/Kconfig +++ b/drivers/soc/fsl/qe/Kconfig @@ -62,6 +62,7 @@ config QE_TDM config QE_USB bool + depends on QUICC_ENGINE default y if USB_FSL_QE help QE USB Controller support |