staging: vchiq_arm: Make DT firmware node mandatory

In Linux Mainline there wasn't a chance to boot the RPi without DT.
So we can make the firmware node mandatory.

Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index 119ca145dbc4450324fefcdd4c39b64fc7bd04bb..ce3ba37fbeb07e9130a5e798d64bb95e6c103091 100644 (file)
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@ -2794,12 +2794,11 @@ static int vchiq_probe(struct platform_device *pdev)
        void *ptr_err;
 
        fw_node = of_parse_phandle(pdev->dev.of_node, "firmware", 0);
-/* Remove comment when booting without Device Tree is no longer supported
        if (!fw_node) {
                dev_err(&pdev->dev, "Missing firmware node\n");
                return -ENOENT;
        }
-*/
+
        fw = rpi_firmware_get(fw_node);
        if (!fw)
                return -EPROBE_DEFER;