Skip to content

Commit

Permalink
include/drivers: remove implicit casts from api pointer initialization
Browse files Browse the repository at this point in the history 
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]>
  • Loading branch information
@pabigot @nashif
pabigot authored and nashif committed Dec 15, 2019
1 parent 6e260af commit 2e358f1
Show file tree
Hide file tree
Showing 12 changed files with 49 additions and 49 deletions.
10 changes: 5 additions & 5 deletions include/audio/codec.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ struct audio_codec_api {
static inline int audio_codec_configure(struct device *dev,
struct audio_codec_cfg *cfg)
{
const struct audio_codec_api *api = dev->driver_api;
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;

return api->configure(dev, cfg);
}
Expand All @@ -149,7 +149,7 @@ static inline int audio_codec_configure(struct device *dev,
*/
static inline void audio_codec_start_output(struct device *dev)
{
const struct audio_codec_api *api = dev->driver_api;
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;

api->start_output(dev);
}
Expand All @@ -165,7 +165,7 @@ static inline void audio_codec_start_output(struct device *dev)
*/
static inline void audio_codec_stop_output(struct device *dev)
{
const struct audio_codec_api *api = dev->driver_api;
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;

api->stop_output(dev);
}
Expand All @@ -185,7 +185,7 @@ static inline void audio_codec_stop_output(struct device *dev)
static inline int audio_codec_set_property(struct device *dev, audio_property_t property,
audio_channel_t channel, audio_property_value_t val)
{
const struct audio_codec_api *api = dev->driver_api;
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;

return api->set_property(dev, property, channel, val);
}
Expand All @@ -203,7 +203,7 @@ static inline int audio_codec_set_property(struct device *dev, audio_property_t
*/
static inline int audio_codec_apply_properties(struct device *dev)
{
const struct audio_codec_api *api = dev->driver_api;
const struct audio_codec_api *api = (const struct audio_codec_api *)dev->driver_api;

return api->apply_properties(dev);
}
Expand Down
6 changes: 3 additions & 3 deletions include/audio/dmic.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ static inline u32_t dmic_build_clk_skew_map(u8_t pdm, u8_t skew)
*/
static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg)
{
const struct _dmic_ops *api = dev->driver_api;
const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api;

return api->configure(dev, cfg);
}
Expand All @@ -242,7 +242,7 @@ static inline int dmic_configure(struct device *dev, struct dmic_cfg *cfg)
*/
static inline int dmic_trigger(struct device *dev, enum dmic_trigger cmd)
{
const struct _dmic_ops *api = dev->driver_api;
const struct _dmic_ops *api = (const struct _dmic_ops *)dev->driver_api;

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

return api->read(dev, stream, buffer, size, timeout);
}
Expand Down
6 changes: 3 additions & 3 deletions include/drivers/can.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ static inline
enum can_state z_impl_can_get_state(struct device *dev,
struct can_bus_err_cnt *err_cnt)
{
const struct can_driver_api *api = dev->driver_api;
const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api;

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

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

return api->recover(dev, timeout);
}
Expand All @@ -588,7 +588,7 @@ static inline
void can_register_state_change_isr(struct device *dev,
can_state_change_isr_t isr)
{
const struct can_driver_api *api = dev->driver_api;
const struct can_driver_api *api = (const struct can_driver_api *)dev->driver_api;

return api->register_state_change_isr(dev, isr);
}
Expand Down
6 changes: 3 additions & 3 deletions include/drivers/eeprom.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ __syscall int eeprom_read(struct device *dev, off_t offset, void *data,
static inline int z_impl_eeprom_read(struct device *dev, off_t offset,
void *data, size_t len)
{
const struct eeprom_driver_api *api = dev->driver_api;
const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api;

return api->read(dev, offset, data, len);
}
Expand All @@ -81,7 +81,7 @@ __syscall int eeprom_write(struct device *dev, off_t offset, const void *data,
static inline int z_impl_eeprom_write(struct device *dev, off_t offset,
const void *data, size_t len)
{
const struct eeprom_driver_api *api = dev->driver_api;
const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api;

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

static inline size_t z_impl_eeprom_get_size(struct device *dev)
{
const struct eeprom_driver_api *api = dev->driver_api;
const struct eeprom_driver_api *api = (const struct eeprom_driver_api *)dev->driver_api;

return api->size(dev);
}
Expand Down
10 changes: 5 additions & 5 deletions include/drivers/flash.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ __syscall int flash_read(struct device *dev, off_t offset, void *data,
static inline int z_impl_flash_read(struct device *dev, off_t offset, void *data,
size_t len)
{
const struct flash_driver_api *api = dev->driver_api;
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;

return api->read(dev, offset, data, len);
}
Expand All @@ -125,7 +125,7 @@ __syscall int flash_write(struct device *dev, off_t offset, const void *data,
static inline int z_impl_flash_write(struct device *dev, off_t offset,
const void *data, size_t len)
{
const struct flash_driver_api *api = dev->driver_api;
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;

return api->write(dev, offset, data, len);
}
Expand Down Expand Up @@ -156,7 +156,7 @@ __syscall int flash_erase(struct device *dev, off_t offset, size_t size);
static inline int z_impl_flash_erase(struct device *dev, off_t offset,
size_t size)
{
const struct flash_driver_api *api = dev->driver_api;
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;

return api->erase(dev, offset, size);
}
Expand All @@ -182,7 +182,7 @@ __syscall int flash_write_protection_set(struct device *dev, bool enable);
static inline int z_impl_flash_write_protection_set(struct device *dev,
bool enable)
{
const struct flash_driver_api *api = dev->driver_api;
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;

return api->write_protection(dev, enable);
}
Expand Down Expand Up @@ -269,7 +269,7 @@ __syscall size_t flash_get_write_block_size(struct device *dev);

static inline size_t z_impl_flash_get_write_block_size(struct device *dev)
{
const struct flash_driver_api *api = dev->driver_api;
const struct flash_driver_api *api = (const struct flash_driver_api *)dev->driver_api;

return api->write_block_size;
}
Expand Down
8 changes: 4 additions & 4 deletions include/drivers/gna.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ struct gna_driver_api {
*/
static inline int gna_configure(struct device *dev, struct gna_config *cfg)
{
const struct gna_driver_api *api = dev->driver_api;
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;

return api->configure(dev, cfg);
}
Expand All @@ -158,7 +158,7 @@ static inline int gna_configure(struct device *dev, struct gna_config *cfg)
static inline int gna_register_model(struct device *dev,
struct gna_model_info *model, void **model_handle)
{
const struct gna_driver_api *api = dev->driver_api;
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;

return api->register_model(dev, model, model_handle);
}
Expand All @@ -178,7 +178,7 @@ static inline int gna_register_model(struct device *dev,
*/
static inline int gna_deregister_model(struct device *dev, void *model)
{
const struct gna_driver_api *api = dev->driver_api;
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;

return api->deregister_model(dev, model);
}
Expand All @@ -200,7 +200,7 @@ static inline int gna_deregister_model(struct device *dev, void *model)
static inline int gna_infer(struct device *dev, struct gna_inference_req *req,
gna_callback callback)
{
const struct gna_driver_api *api = dev->driver_api;
const struct gna_driver_api *api = (const struct gna_driver_api *)dev->driver_api;

return api->infer(dev, req, callback);
}
Expand Down
10 changes: 5 additions & 5 deletions include/drivers/i2s.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ __syscall int i2s_configure(struct device *dev, enum i2s_dir dir,
static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir,
struct i2s_config *cfg)
{
const struct i2s_driver_api *api = dev->driver_api;
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;

return api->configure(dev, dir, cfg);
}
Expand All @@ -368,7 +368,7 @@ static inline int z_impl_i2s_configure(struct device *dev, enum i2s_dir dir,
static inline struct i2s_config *i2s_config_get(struct device *dev,
enum i2s_dir dir)
{
const struct i2s_driver_api *api = dev->driver_api;
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;

return api->config_get(dev, dir);
}
Expand Down Expand Up @@ -407,7 +407,7 @@ static inline struct i2s_config *i2s_config_get(struct device *dev,
static inline int i2s_read(struct device *dev, void **mem_block,
size_t *size)
{
const struct i2s_driver_api *api = dev->driver_api;
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;

return api->read(dev, mem_block, size);
}
Expand Down Expand Up @@ -466,7 +466,7 @@ __syscall int i2s_buf_read(struct device *dev, void *buf, size_t *size);
*/
static inline int i2s_write(struct device *dev, void *mem_block, size_t size)
{
const struct i2s_driver_api *api = dev->driver_api;
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;

return api->write(dev, mem_block, size);
}
Expand Down Expand Up @@ -511,7 +511,7 @@ __syscall int i2s_trigger(struct device *dev, enum i2s_dir dir,
static inline int z_impl_i2s_trigger(struct device *dev, enum i2s_dir dir,
enum i2s_trigger_cmd cmd)
{
const struct i2s_driver_api *api = dev->driver_api;
const struct i2s_driver_api *api = (const struct i2s_driver_api *)dev->driver_api;

return api->trigger(dev, dir, cmd);
}
Expand Down
10 changes: 5 additions & 5 deletions include/drivers/ipm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ __syscall int ipm_send(struct device *ipmdev, int wait, u32_t id,
static inline int z_impl_ipm_send(struct device *ipmdev, int wait, u32_t id,
const void *data, int size)
{
const struct ipm_driver_api *api = ipmdev->driver_api;
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;

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

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

static inline int z_impl_ipm_max_data_size_get(struct device *ipmdev)
{
const struct ipm_driver_api *api = ipmdev->driver_api;
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;

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

static inline u32_t z_impl_ipm_max_id_val_get(struct device *ipmdev)
{
const struct ipm_driver_api *api = ipmdev->driver_api;
const struct ipm_driver_api *api = (const struct ipm_driver_api *)ipmdev->driver_api;

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

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

return api->set_enabled(ipmdev, enable);
}
Expand Down
8 changes: 4 additions & 4 deletions include/drivers/led.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ __syscall int led_blink(struct device *dev, u32_t led,
static inline int z_impl_led_blink(struct device *dev, u32_t led,
u32_t delay_on, u32_t delay_off)
{
const struct led_driver_api *api = dev->driver_api;
const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api;

return api->blink(dev, led, delay_on, delay_off);
}
Expand All @@ -99,7 +99,7 @@ __syscall int led_set_brightness(struct device *dev, u32_t led,
static inline int z_impl_led_set_brightness(struct device *dev, u32_t led,
u8_t value)
{
const struct led_driver_api *api = dev->driver_api;
const struct led_driver_api *api = (const struct led_driver_api *)dev->driver_api;

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

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

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

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

return api->off(dev, led);
}
Expand Down
10 changes: 5 additions & 5 deletions include/irq_nextlevel.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ struct irq_next_level_api {
*/
static inline void irq_enable_next_level(struct device *dev, u32_t irq)
{
const struct irq_next_level_api *api = dev->driver_api;
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;

api->intr_enable(dev, irq);
}
Expand All @@ -68,7 +68,7 @@ static inline void irq_enable_next_level(struct device *dev, u32_t irq)
*/
static inline void irq_disable_next_level(struct device *dev, u32_t irq)
{
const struct irq_next_level_api *api = dev->driver_api;
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;

api->intr_disable(dev, irq);
}
Expand All @@ -85,7 +85,7 @@ static inline void irq_disable_next_level(struct device *dev, u32_t irq)
*/
static inline unsigned int irq_is_enabled_next_level(struct device *dev)
{
const struct irq_next_level_api *api = dev->driver_api;
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;

return api->intr_get_state(dev);
}
Expand All @@ -106,7 +106,7 @@ static inline unsigned int irq_is_enabled_next_level(struct device *dev)
static inline void irq_set_priority_next_level(struct device *dev, u32_t irq,
u32_t prio, u32_t flags)
{
const struct irq_next_level_api *api = dev->driver_api;
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;

if (api->intr_set_priority)
api->intr_set_priority(dev, irq, prio, flags);
Expand All @@ -125,7 +125,7 @@ static inline void irq_set_priority_next_level(struct device *dev, u32_t irq,
static inline unsigned int irq_line_is_enabled_next_level(struct device *dev,
unsigned int irq)
{
const struct irq_next_level_api *api = dev->driver_api;
const struct irq_next_level_api *api = (const struct irq_next_level_api *)dev->driver_api;

return api->intr_get_line_state(dev, irq);
}
Expand Down
Loading

0 comments on commit 2e358f1

Please sign in to comment.