This series just introduces five extra patches for dropping include directives from Makefiles (suggested by Greg KH) and rebased. The main patch (6/6) removes platform device/driver abuse and moves things to standard device/driver model using a custom_bus. Specific details are elaborated in the commit message. The patch series is based on top of d514392f17fd (tag: next-20230120) of linux-next. Changes in v6: - Split struct device and struct driver wrappers in vchiq_device.[ch] - Move vchiq_bus_type definition to vchiq_device.[ch] as well - return error on bus_register() failure - drop dma_set_mask_and_coherent - trivial variable name change Changes in v5: - Fixup missing "staging: " in commits' subject line - No code changes from v4 Changes in v4: - Introduce patches to drop include directives from Makefile Changes in v3: - Rework entirely to replace platform devices/driver model -v2: https://lore.kernel.org/all/20221222191500.515795-1-umang.jain@xxxxxxxxxxxxxxxx/ -v1: https://lore.kernel.org/all/20221220084404.19280-1-umang.jain@xxxxxxxxxxxxxxxx/ Umang Jain (6): staging: vc04_services: Drop __VCCOREVER__ remnants staging: vc04_services: bcm2835-audio: Drop include Makefile directive staging: vc04_services: bcm2835-camera: Drop include Makefile directive staging: vc04_services: vchiq-mmal: Drop include Makefile directive staging: vc04_services: interface: Drop include Makefile directive staging: vc04_services: vchiq: Register devices with a custom bus_type drivers/staging/vc04_services/Makefile | 3 +- .../vc04_services/bcm2835-audio/Makefile | 2 - .../vc04_services/bcm2835-audio/bcm2835.c | 27 +++-- .../vc04_services/bcm2835-audio/bcm2835.h | 3 +- .../vc04_services/bcm2835-camera/Makefile | 5 - .../bcm2835-camera/bcm2835-camera.c | 35 +++--- .../vc04_services/bcm2835-camera/controls.c | 6 +- .../interface/vchiq_arm/vchiq_arm.c | 52 +++++---- .../interface/vchiq_arm/vchiq_core.h | 2 +- .../interface/vchiq_arm/vchiq_device.c | 102 ++++++++++++++++++ .../interface/vchiq_arm/vchiq_device.h | 39 +++++++ .../interface/vchiq_arm/vchiq_ioctl.h | 3 +- .../staging/vc04_services/vchiq-mmal/Makefile | 5 - .../vc04_services/vchiq-mmal/mmal-vchiq.c | 2 +- 14 files changed, 206 insertions(+), 80 deletions(-) create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.h -- 2.39.0