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 /include | |
| parent | 3f711c249032fee954e92e4d04c8cd2744994291 (diff) | |
| parent | fb9c384625dd604e8a5be1f42b35e83104b90670 (diff) | |
| download | lwn-356fa4975950d48d12b6ee9f9050ad429db25852.tar.gz lwn-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 'include')
| -rw-r--r-- | include/linux/fsl/mc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h index a86115bc799c..a1b3de87a3d1 100644 --- a/include/linux/fsl/mc.h +++ b/include/linux/fsl/mc.h @@ -48,7 +48,7 @@ struct fsl_mc_driver { struct device_driver driver; const struct fsl_mc_device_id *match_id_table; int (*probe)(struct fsl_mc_device *dev); - int (*remove)(struct fsl_mc_device *dev); + void (*remove)(struct fsl_mc_device *dev); void (*shutdown)(struct fsl_mc_device *dev); int (*suspend)(struct fsl_mc_device *dev, pm_message_t state); int (*resume)(struct fsl_mc_device *dev); |