Skip to content

Commit 2e358f1

Browse files
pabigotnashif
pabigot
authored and
nashif
committed
include/drivers: remove implicit casts from api pointer initialization
C++ disallows implicit cast of void pointers to a non-void pointer type. Presence of implicit casts prevents use of these headers in C++ applications. Process: Run the following coccinelle script: @@ identifier V; identifier TAG =~ "driver_api"; type T; expression E; @@ T* V = +(T *) E->TAG; in this command line from $ZEPHYR_BASE: spatch --sp-file expcast.cocci \ --include-headers --dir include/ --very-quiet \ | sed -e '/^\+/s@\*) @*)@' \ | (cd include/ ; patch -p1) Signed-off-by: Peter A. Bigot <[email protected]>
1 parent 6e260af commit 2e358f1

File tree

12 files changed

+49
-49
lines changed

12 files changed

+49
-49
lines changed

‎include/audio/codec.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ struct audio_codec_api {
133133
static inline int audio_codec_configure(struct device *dev,
134134
struct audio_codec_cfg *cfg)
135135
{
136-
const struct audio_codec_api *api = dev->driver_api;
136+
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;
137137

138138
return api->configure(dev, cfg);
139139
}
@@ -149,7 +149,7 @@ static inline int audio_codec_configure(struct device *dev,
149149
*/
150150
static inline void audio_codec_start_output(struct device *dev)
151151
{
152-
const struct audio_codec_api *api = dev->driver_api;
152+
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;
153153

154154
api->start_output(dev);
155155
}
@@ -165,7 +165,7 @@ static inline void audio_codec_start_output(struct device *dev)
165165
*/
166166
static inline void audio_codec_stop_output(struct device *dev)
167167
{
168-
const struct audio_codec_api *api = dev->driver_api;
168+
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;
169169

170170
api->stop_output(dev);
171171
}
@@ -185,7 +185,7 @@ static inline void audio_codec_stop_output(struct device *dev)
185185
static inline int audio_codec_set_property(struct device *dev, audio_property_t property,
186186
audio_channel_t channel, audio_property_value_t val)
187187
{
188-
const struct audio_codec_api *api = dev->driver_api;
188+
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;
189189

190190
return api->set_property(dev, property, channel, val);
191191
}
@@ -203,7 +203,7 @@ static inline int audio_codec_set_property(struct device *dev, audio_property_t
203203
*/
204204
static inline int audio_codec_apply_properties(struct device *dev)
205205
{
206-
const struct audio_codec_api *api = dev->driver_api;
206+
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;
207207

208208
return api->apply_properties(dev);
209209
}

‎include/audio/dmic.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ static inline u32_t dmic_build_clk_skew_map(u8_t pdm, u8_t skew)
225225
*/
226226
static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg)
227227
{
228-
const struct _dmic_ops *api = dev->driver_api;
228+
const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api;
229229

230230
return api->configure(dev, cfg);
231231
}
@@ -242,7 +242,7 @@ static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg)
242242
*/
243243
static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd)
244244
{
245-
const struct _dmic_ops *api = dev->driver_api;
245+
const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api;
246246

247247
return api->trigger(dev, cmd);
248248
}
@@ -264,7 +264,7 @@ static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd)
264264
static inline int dmic_read(struct device *dev, u8_t stream, void **buffer,
265265
size_t *size, s32_t timeout)
266266
{
267-
const struct _dmic_ops *api = dev->driver_api;
267+
const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api;
268268

269269
return api->read(dev, stream, buffer, size, timeout);
270270
}

‎include/drivers/can.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,7 @@ static inline
542542
enum can_state z_impl_can_get_state(struct device *dev,
543543
struct can_bus_err_cnt *err_cnt)
544544
{
545-
const struct can_driver_api *api = dev->driver_api;
545+
const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api;
546546

547547
return api->get_state(dev, err_cnt);
548548
}
@@ -563,7 +563,7 @@ __syscall int can_recover(struct device *dev, s32_t timeout);
563563

564564
static inline int z_impl_can_recover(struct device *dev, s32_t timeout)
565565
{
566-
const struct can_driver_api *api = dev->driver_api;
566+
const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api;
567567

568568
return api->recover(dev, timeout);
569569
}
@@ -588,7 +588,7 @@ static inline
588588
void can_register_state_change_isr(struct device *dev,
589589
can_state_change_isr_t isr)
590590
{
591-
const struct can_driver_api *api = dev->driver_api;
591+
const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api;
592592

593593
return api->register_state_change_isr(dev, isr);
594594
}

‎include/drivers/eeprom.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ __syscall int eeprom_read(struct device *dev, off_t offset, void *data,
6060
static inline int z_impl_eeprom_read(struct device *dev, off_t offset,
6161
void *data, size_t len)
6262
{
63-
const struct eeprom_driver_api *api = dev->driver_api;
63+
const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api;
6464

6565
return api->read(dev, offset, data, len);
6666
}
@@ -81,7 +81,7 @@ __syscall int eeprom_write(struct device *dev, off_t offset, const void *data,
8181
static inline int z_impl_eeprom_write(struct device *dev, off_t offset,
8282
const void *data, size_t len)
8383
{
84-
const struct eeprom_driver_api *api = dev->driver_api;
84+
const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api;
8585

8686
return api->write(dev, offset, data, len);
8787
}
@@ -97,7 +97,7 @@ __syscall size_t eeprom_get_size(struct device *dev);
9797

9898
static inline size_t z_impl_eeprom_get_size(struct device *dev)
9999
{
100-
const struct eeprom_driver_api *api = dev->driver_api;
100+
const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api;
101101

102102
return api->size(dev);
103103
}

‎include/drivers/flash.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ __syscall int flash_read(struct device *dev, off_t offset, void *data,
101101
static inline int z_impl_flash_read(struct device *dev, off_t offset, void *data,
102102
size_t len)
103103
{
104-
const struct flash_driver_api *api = dev->driver_api;
104+
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;
105105

106106
return api->read(dev, offset, data, len);
107107
}
@@ -125,7 +125,7 @@ __syscall int flash_write(struct device *dev, off_t offset, const void *data,
125125
static inline int z_impl_flash_write(struct device *dev, off_t offset,
126126
const void *data, size_t len)
127127
{
128-
const struct flash_driver_api *api = dev->driver_api;
128+
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;
129129

130130
return api->write(dev, offset, data, len);
131131
}
@@ -156,7 +156,7 @@ __syscall int flash_erase(struct device *dev, off_t offset, size_t size);
156156
static inline int z_impl_flash_erase(struct device *dev, off_t offset,
157157
size_t size)
158158
{
159-
const struct flash_driver_api *api = dev->driver_api;
159+
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;
160160

161161
return api->erase(dev, offset, size);
162162
}
@@ -182,7 +182,7 @@ __syscall int flash_write_protection_set(struct device *dev, bool enable);
182182
static inline int z_impl_flash_write_protection_set(struct device *dev,
183183
bool enable)
184184
{
185-
const struct flash_driver_api *api = dev->driver_api;
185+
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;
186186

187187
return api->write_protection(dev, enable);
188188
}
@@ -269,7 +269,7 @@ __syscall size_t flash_get_write_block_size(struct device *dev);
269269

270270
static inline size_t z_impl_flash_get_write_block_size(struct device *dev)
271271
{
272-
const struct flash_driver_api *api = dev->driver_api;
272+
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;
273273

274274
return api->write_block_size;
275275
}

‎include/drivers/gna.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ struct gna_driver_api {
137137
*/
138138
static inline int gna_configure(struct device *dev, struct gna_config *cfg)
139139
{
140-
const struct gna_driver_api *api = dev->driver_api;
140+
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;
141141

142142
return api->configure(dev, cfg);
143143
}
@@ -158,7 +158,7 @@ static inline int gna_configure(struct device *dev, struct gna_config *cfg)
158158
static inline int gna_register_model(struct device *dev,
159159
struct gna_model_info *model, void **model_handle)
160160
{
161-
const struct gna_driver_api *api = dev->driver_api;
161+
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;
162162

163163
return api->register_model(dev, model, model_handle);
164164
}
@@ -178,7 +178,7 @@ static inline int gna_register_model(struct device *dev,
178178
*/
179179
static inline int gna_deregister_model(struct device *dev, void *model)
180180
{
181-
const struct gna_driver_api *api = dev->driver_api;
181+
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;
182182

183183
return api->deregister_model(dev, model);
184184
}
@@ -200,7 +200,7 @@ static inline int gna_deregister_model(struct device *dev, void *model)
200200
static inline int gna_infer(struct device *dev, struct gna_inference_req *req,
201201
gna_callback callback)
202202
{
203-
const struct gna_driver_api *api = dev->driver_api;
203+
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;
204204

205205
return api->infer(dev, req, callback);
206206
}

‎include/drivers/i2s.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ __syscall int i2s_configure(struct device *dev, enum i2s_dir dir,
352352
static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir,
353353
struct i2s_config *cfg)
354354
{
355-
const struct i2s_driver_api *api = dev->driver_api;
355+
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;
356356

357357
return api->configure(dev, dir, cfg);
358358
}
@@ -368,7 +368,7 @@ static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir,
368368
static inline struct i2s_config *i2s_config_get(struct device *dev,
369369
enum i2s_dir dir)
370370
{
371-
const struct i2s_driver_api *api = dev->driver_api;
371+
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;
372372

373373
return api->config_get(dev, dir);
374374
}
@@ -407,7 +407,7 @@ static inline struct i2s_config *i2s_config_get(struct device *dev,
407407
static inline int i2s_read(struct device *dev, void **mem_block,
408408
size_t *size)
409409
{
410-
const struct i2s_driver_api *api = dev->driver_api;
410+
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;
411411

412412
return api->read(dev, mem_block, size);
413413
}
@@ -466,7 +466,7 @@ __syscall int i2s_buf_read(struct device *dev, void *buf, size_t *size);
466466
*/
467467
static inline int i2s_write(struct device *dev, void *mem_block, size_t size)
468468
{
469-
const struct i2s_driver_api *api = dev->driver_api;
469+
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;
470470

471471
return api->write(dev, mem_block, size);
472472
}
@@ -511,7 +511,7 @@ __syscall int i2s_trigger(struct device *dev, enum i2s_dir dir,
511511
static inline int z_impl_i2s_trigger(struct device *dev, enum i2s_dir dir,
512512
enum i2s_trigger_cmd cmd)
513513
{
514-
const struct i2s_driver_api *api = dev->driver_api;
514+
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;
515515

516516
return api->trigger(dev, dir, cmd);
517517
}

‎include/drivers/ipm.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ __syscall int ipm_send(struct device *ipmdev, int wait, u32_t id,
134134
static inline int z_impl_ipm_send(struct device *ipmdev, int wait, u32_t id,
135135
const void *data, int size)
136136
{
137-
const struct ipm_driver_api *api = ipmdev->driver_api;
137+
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;
138138

139139
return api->send(ipmdev, wait, id, data, size);
140140
}
@@ -150,7 +150,7 @@ static inline int z_impl_ipm_send(struct device *ipmdev, int wait, u32_t id,
150150
static inline void ipm_register_callback(struct device *ipmdev,
151151
ipm_callback_t cb, void *context)
152152
{
153-
const struct ipm_driver_api *api = ipmdev->driver_api;
153+
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;
154154

155155
api->register_callback(ipmdev, cb, context);
156156
}
@@ -169,7 +169,7 @@ __syscall int ipm_max_data_size_get(struct device *ipmdev);
169169

170170
static inline int z_impl_ipm_max_data_size_get(struct device *ipmdev)
171171
{
172-
const struct ipm_driver_api *api = ipmdev->driver_api;
172+
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;
173173

174174
return api->max_data_size_get(ipmdev);
175175
}
@@ -189,7 +189,7 @@ __syscall u32_t ipm_max_id_val_get(struct device *ipmdev);
189189

190190
static inline u32_t z_impl_ipm_max_id_val_get(struct device *ipmdev)
191191
{
192-
const struct ipm_driver_api *api = ipmdev->driver_api;
192+
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;
193193

194194
return api->max_id_val_get(ipmdev);
195195
}
@@ -207,7 +207,7 @@ __syscall int ipm_set_enabled(struct device *ipmdev, int enable);
207207

208208
static inline int z_impl_ipm_set_enabled(struct device *ipmdev, int enable)
209209
{
210-
const struct ipm_driver_api *api = ipmdev->driver_api;
210+
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;
211211

212212
return api->set_enabled(ipmdev, enable);
213213
}

‎include/drivers/led.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ __syscall int led_blink(struct device *dev, u32_t led,
7777
static inline int z_impl_led_blink(struct device *dev, u32_t led,
7878
u32_t delay_on, u32_t delay_off)
7979
{
80-
const struct led_driver_api *api = dev->driver_api;
80+
const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api;
8181

8282
return api->blink(dev, led, delay_on, delay_off);
8383
}
@@ -99,7 +99,7 @@ __syscall int led_set_brightness(struct device *dev, u32_t led,
9999
static inline int z_impl_led_set_brightness(struct device *dev, u32_t led,
100100
u8_t value)
101101
{
102-
const struct led_driver_api *api = dev->driver_api;
102+
const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api;
103103

104104
return api->set_brightness(dev, led, value);
105105
}
@@ -117,7 +117,7 @@ __syscall int led_on(struct device *dev, u32_t led);
117117

118118
static inline int z_impl_led_on(struct device *dev, u32_t led)
119119
{
120-
const struct led_driver_api *api = dev->driver_api;
120+
const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api;
121121

122122
return api->on(dev, led);
123123
}
@@ -135,7 +135,7 @@ __syscall int led_off(struct device *dev, u32_t led);
135135

136136
static inline int z_impl_led_off(struct device *dev, u32_t led)
137137
{
138-
const struct led_driver_api *api = dev->driver_api;
138+
const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api;
139139

140140
return api->off(dev, led);
141141
}

‎include/irq_nextlevel.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ struct irq_next_level_api {
5151
*/
5252
static inline void irq_enable_next_level(struct device *dev, u32_t irq)
5353
{
54-
const struct irq_next_level_api *api = dev->driver_api;
54+
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;
5555

5656
api->intr_enable(dev, irq);
5757
}
@@ -68,7 +68,7 @@ static inline void irq_enable_next_level(struct device *dev, u32_t irq)
6868
*/
6969
static inline void irq_disable_next_level(struct device *dev, u32_t irq)
7070
{
71-
const struct irq_next_level_api *api = dev->driver_api;
71+
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;
7272

7373
api->intr_disable(dev, irq);
7474
}
@@ -85,7 +85,7 @@ static inline void irq_disable_next_level(struct device *dev, u32_t irq)
8585
*/
8686
static inline unsigned int irq_is_enabled_next_level(struct device *dev)
8787
{
88-
const struct irq_next_level_api *api = dev->driver_api;
88+
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;
8989

9090
return api->intr_get_state(dev);
9191
}
@@ -106,7 +106,7 @@ static inline unsigned int irq_is_enabled_next_level(struct device *dev)
106106
static inline void irq_set_priority_next_level(struct device *dev, u32_t irq,
107107
u32_t prio, u32_t flags)
108108
{
109-
const struct irq_next_level_api *api = dev->driver_api;
109+
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;
110110

111111
if (api->intr_set_priority)
112112
api->intr_set_priority(dev, irq, prio, flags);
@@ -125,7 +125,7 @@ static inline void irq_set_priority_next_level(struct device *dev, u32_t irq,
125125
static inline unsigned int irq_line_is_enabled_next_level(struct device *dev,
126126
unsigned int irq)
127127
{
128-
const struct irq_next_level_api *api = dev->driver_api;
128+
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;
129129

130130
return api->intr_get_line_state(dev, irq);
131131
}

0 commit comments

Comments
 (0)