michaelh/zephyr
1
0
Fork 0
Code Releases Activity

include/drivers: remove implicit casts from api pointer initialization

Browse source 
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 <pab@pabigot.com>
This commit is contained in:
Peter A. Bigot 2019-12-13 15:46:14 -06:00 • committed by Anas Nashif
commit 2e358f11d0
12 changed files with 49 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/drivers/can.h
View file

@ -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);
}
@ -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);
}
@ -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);
}

6
include/drivers/eeprom.h
View file

@ -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);
}
@ -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);
}
@ -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);
}

10
include/drivers/flash.h
View file

@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}
@ -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;
}

8
include/drivers/gna.h
View file

@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}

10
include/drivers/i2s.h
View file

@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}

10
include/drivers/ipm.h
View file

@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}

8
include/drivers/led.h
View file

@ -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);
}
@ -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);
}
@ -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);
}
@ -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);
}