diff options
author | Michael Zoran <mzoran@crowfest.net> | 2017-02-18 06:22:01 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-26 11:05:48 -0500 |
commit | 6cf1bf636a067eb308cb3a8322b9d6b1844a075d (patch) | |
tree | 9fb47bc5a7b9f29c6284c1c4017f1679c876d477 | |
parent | f4082c6f28a8e77dcb694c6f23de9e533251051d (diff) |
staging: vchiq_2835_arm: Make cache-line-size a required DT property
The original github source allowed for the cache-line-size property
to be missing. Since recent firmwares also require this property,
it makes sense to always require it in the driver as well.
If the cache-line-size property is missing, then the driver probe
should fail as no dev since the kernel and dt may be out of sync.
The fix is to add a check for the return value of of_property_read_u32.
Changes V2:
1. Add error message if cache-line-size is missing.
2. Simple check for non-zero return value from
of_property_read_u32.
Signed-off-by: Michael Zoran <mzoran@crowfest.net>
Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c index e6241fb5cfa6..3aeffcb9c87e 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | |||
@@ -121,8 +121,14 @@ int vchiq_platform_init(struct platform_device *pdev, VCHIQ_STATE_T *state) | |||
121 | if (err < 0) | 121 | if (err < 0) |
122 | return err; | 122 | return err; |
123 | 123 | ||
124 | (void)of_property_read_u32(dev->of_node, "cache-line-size", | 124 | err = of_property_read_u32(dev->of_node, "cache-line-size", |
125 | &g_cache_line_size); | 125 | &g_cache_line_size); |
126 | |||
127 | if (err) { | ||
128 | dev_err(dev, "Missing cache-line-size property\n"); | ||
129 | return -ENODEV; | ||
130 | } | ||
131 | |||
126 | g_fragments_size = 2 * g_cache_line_size; | 132 | g_fragments_size = 2 * g_cache_line_size; |
127 | 133 | ||
128 | /* Allocate space for the channels in coherent memory */ | 134 | /* Allocate space for the channels in coherent memory */ |