staging: fsl-mc: Fixed uintX_t CHECK checkpatch warnings
PATCH 1/1 staging: fsl-mc: Fixed uintX_t CHECK checkpatch warnings
Replaced all uses of uintX_t types to uX types, to be checkpatch clean.
Signed-off-by J. German Rivera <[email protected]>
---
This patch depends on the patch posted at
http://www.mail-archive.com/[email protected]/msg981518.html
drivers/staging/fsl-mc/bus/dpbp.c | 112 +++++++-------- drivers/staging/fsl-mc/bus/dpmcp.c | 98 ++++++------- drivers/staging/fsl-mc/bus/dpmng.c | 4 +- drivers/staging/fsl-mc/bus/dprc-driver.c | 2 +- drivers/staging/fsl-mc/bus/dprc.c | 184 ++++++++++++------------ drivers/staging/fsl-mc/bus/mc-allocator.c | 4 +- drivers/staging/fsl-mc/bus/mc-bus.c | 6 +- drivers/staging/fsl-mc/bus/mc-sys.c | 6 +- drivers/staging/fsl-mc/include/dpbp.h | 108 +++++++------- drivers/staging/fsl-mc/include/dpmng.h | 10 +- drivers/staging/fsl-mc/include/dprc.h | 212 ++++++++++++++-------------- drivers/staging/fsl-mc/include/mc-cmd.h | 26 ++-- drivers/staging/fsl-mc/include/mc-private.h | 6 +- drivers/staging/fsl-mc/include/mc-sys.h | 8 +- drivers/staging/fsl-mc/include/mc.h | 16 +-- 15 files changed, 401 insertions(+), 401 deletions(-)
drivers/staging/fsl-mc/bus/dpbp.c +56 -56
@@ -52,9 +52,9 @@* Return: '0' on Success; Error code otherwise. */ int dpbp_open (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, +u32 cmd_flags,int dpbp_id, -uint16_t *token) +u16 *token) {struct mc_command cmd = {0 };int err;
@@ -88,8 +88,8 @@ EXPORT_SYMBOL(dpbp_open);* Return: '0' on Success; Error code otherwise. */ int dpbp_close (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token) +u32 cmd_flags, +u16 token) {struct mc_command cmd = {0 };
@@ -124,9 +124,9 @@ EXPORT_SYMBOL(dpbp_close);* Return: '0' on Success; Error code otherwise. */ int dpbp_create (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, +u32 cmd_flags,const struct dpbp_cfg *cfg, -uint16_t *token) +u16 *token) {struct mc_command cmd = {0 };int err;
@@ -157,8 +157,8 @@ int dpbp_create(struct fsl_mc_io *mc_io,* Return: '0' on Success; error code otherwise. */ int dpbp_destroy (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token) +u32 cmd_flags, +u16 token) {struct mc_command cmd = {0 };
@@ -179,8 +179,8 @@ int dpbp_destroy(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_enable (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token) +u32 cmd_flags, +u16 token) {struct mc_command cmd = {0 };
@@ -202,8 +202,8 @@ EXPORT_SYMBOL(dpbp_enable);* Return: '0' on Success; Error code otherwise. */ int dpbp_disable (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token) +u32 cmd_flags, +u16 token) {struct mc_command cmd = {0 };
@@ -226,8 +226,8 @@ EXPORT_SYMBOL(dpbp_disable);* Return: '0' on Success; Error code otherwise. */ int dpbp_is_enabled (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, +u32 cmd_flags, +u16 token,int *en) {struct mc_command cmd = {0 };
@@ -256,8 +256,8 @@ int dpbp_is_enabled(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_reset (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token) +u32 cmd_flags, +u16 token) {struct mc_command cmd = {0 };
@@ -280,9 +280,9 @@ int dpbp_reset(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_set_irq (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, +u32 cmd_flags, +u16 token, +u8 irq_index,struct dpbp_irq_cfg *irq_cfg) {struct mc_command cmd = {0 };
@@ -312,9 +312,9 @@ int dpbp_set_irq(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_get_irq (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, +u32 cmd_flags, +u16 token, +u8 irq_index,int *type,struct dpbp_irq_cfg *irq_cfg) {
@@ -332,8 +332,8 @@ int dpbp_get_irq(struct fsl_mc_io *mc_io,return err;/* retrieve response parameters */ - irq_cfg->val = (uint32_t )mc_dec (cmd.params[0 ],0 ,32 ); - irq_cfg->addr = (uint64_t )mc_dec (cmd.params[1 ],0 ,64 ); + irq_cfg->val = (u32 )mc_dec (cmd.params[0 ],0 ,32 ); + irq_cfg->addr = (u64 )mc_dec (cmd.params[1 ],0 ,64 ); irq_cfg->user_irq_id = (int )mc_dec (cmd.params[2 ],0 ,32 ); *type = (int )mc_dec (cmd.params[2 ],32 ,32 );return 0 ;
@@ -355,10 +355,10 @@ int dpbp_get_irq(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_set_irq_enable (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, -uint8_t en) +u32 cmd_flags, +u16 token, +u8 irq_index, +u8 en) {struct mc_command cmd = {0 };
@@ -383,10 +383,10 @@ int dpbp_set_irq_enable(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_get_irq_enable (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, -uint8_t *en) +u32 cmd_flags, +u16 token, +u8 irq_index, +u8 *en) {struct mc_command cmd = {0 };int err;
@@ -402,7 +402,7 @@ int dpbp_get_irq_enable(struct fsl_mc_io *mc_io,return err;/* retrieve response parameters */ - *en = (uint8_t )mc_dec (cmd.params[0 ],0 ,8 ); + *en = (u8 )mc_dec (cmd.params[0 ],0 ,8 );return 0 ; }
@@ -423,10 +423,10 @@ int dpbp_get_irq_enable(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_set_irq_mask (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, -uint32_t mask) +u32 cmd_flags, +u16 token, +u8 irq_index, +u32 mask) {struct mc_command cmd = {0 };
@@ -454,10 +454,10 @@ int dpbp_set_irq_mask(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_get_irq_mask (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, -uint32_t *mask) +u32 cmd_flags, +u16 token, +u8 irq_index, +u32 *mask) {struct mc_command cmd = {0 };int err;
@@ -473,7 +473,7 @@ int dpbp_get_irq_mask(struct fsl_mc_io *mc_io,return err;/* retrieve response parameters */ - *mask = (uint32_t )mc_dec (cmd.params[0 ],0 ,32 ); + *mask = (u32 )mc_dec (cmd.params[0 ],0 ,32 );return 0 ; }
@@ -491,10 +491,10 @@ int dpbp_get_irq_mask(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_get_irq_status (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, -uint32_t *status) +u32 cmd_flags, +u16 token, +u8 irq_index, +u32 *status) {struct mc_command cmd = {0 };int err;
@@ -510,7 +510,7 @@ int dpbp_get_irq_status(struct fsl_mc_io *mc_io,return err;/* retrieve response parameters */ - *status = (uint32_t )mc_dec (cmd.params[0 ],0 ,32 ); + *status = (u32 )mc_dec (cmd.params[0 ],0 ,32 );return 0 ; }
@@ -528,10 +528,10 @@ int dpbp_get_irq_status(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_clear_irq_status (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, -uint8_t irq_index, -uint32_t status) +u32 cmd_flags, +u16 token, +u8 irq_index, +u32 status) {struct mc_command cmd = {0 };
@@ -556,8 +556,8 @@ int dpbp_clear_irq_status(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpbp_get_attributes (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, -uint16_t token, +u32 cmd_flags, +u16 token,struct dpbp_attr *attr) {struct mc_command cmd = {0 };
@@ -573,10 +573,10 @@ int dpbp_get_attributes(struct fsl_mc_io *mc_io,return err;/* retrieve response parameters */ - attr->bpid = (uint16_t )mc_dec (cmd.params[0 ],16 ,16 ); + attr->bpid = (u16 )mc_dec (cmd.params[0 ],16 ,16 ); attr->id = (int )mc_dec (cmd.params[0 ],32 ,32 ); - attr->version.major = (uint16_t )mc_dec (cmd.params[1 ],0 ,16 ); - attr->version.minor = (uint16_t )mc_dec (cmd.params[1 ],16 ,16 ); + attr->version.major = (u16 )mc_dec (cmd.params[1 ],0 ,16 ); + attr->version.minor = (u16 )mc_dec (cmd.params[1 ],16 ,16 );return 0 ; }EXPORT_SYMBOL (dpbp_get_attributes);
drivers/staging/fsl-mc/bus/dpmcp.c +49 -49
213 lines not on this page · raw message
drivers/staging/fsl-mc/bus/dpmng.c +2 -2
@@ -44,7 +44,7 @@* Return: '0' on Success; Error code otherwise. */ int mc_get_version (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, +u32 cmd_flags,struct mc_version *mc_ver_info) {struct mc_command cmd = {0 };
@@ -77,7 +77,7 @@ int mc_get_version(struct fsl_mc_io *mc_io,* Return: '0' on Success; Error code otherwise. */ int dpmng_get_container_id (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, +u32 cmd_flags,int *container_id) {struct mc_command cmd = {0 };
drivers/staging/fsl-mc/bus/dprc-driver.c +1 -1
@@ -126,7 +126,7 @@ static void check_plugged_state_change(struct fsl_mc_device *mc_dev, struct dprc_obj_desc *obj_desc) {int error; -uint32_t plugged_flag_at_mc = +u32 plugged_flag_at_mc = (obj_desc->state &DPRC_OBJ_STATE_PLUGGED ); if (plugged_flag_at_mc !=
drivers/staging/fsl-mc/bus/dprc.c +92 -92
401 lines not on this page · raw message
drivers/staging/fsl-mc/bus/mc-allocator.c +2 -2
@@ -277,7 +277,7 @@ EXPORT_SYMBOL_GPL(fsl_mc_resource_free);* portal is allocated from its own MC bus. */ int __must_check fsl_mc_portal_allocate (struct fsl_mc_device *mc_dev, -uint16_t mc_io_flags, +u16 mc_io_flags,struct fsl_mc_io **new_mc_io) {struct fsl_mc_device *mc_bus_dev;
@@ -363,7 +363,7 @@ EXPORT_SYMBOL_GPL(fsl_mc_portal_free);int fsl_mc_portal_reset (struct fsl_mc_io *mc_io) {int error; -uint16_t token; +u16 token;struct fsl_mc_resource *resource = mc_io->resource;struct fsl_mc_device *mc_dev = resource->data;
drivers/staging/fsl-mc/bus/mc-bus.c +3 -3
@@ -207,7 +207,7 @@ void fsl_mc_driver_unregister(struct fsl_mc_driver *mc_driver)EXPORT_SYMBOL_GPL (fsl_mc_driver_unregister);static int get_dprc_icid (struct fsl_mc_io *mc_io, -int container_id,uint16_t *icid) +int container_id,u16 *icid) {u16 dprc_handle;struct dprc_attributes attr;
@@ -507,7 +507,7 @@ static int parse_mc_ranges(struct device *dev,int *mc_addr_cells, int *mc_size_cells, const __be32 **ranges_start, - uint8_t *num_ranges) + u8 *num_ranges) { const __be32 *prop;int range_tuple_cell_count;
@@ -555,7 +555,7 @@ static int parse_mc_ranges(struct device *dev,static int get_mc_addr_translation_ranges (struct device *dev,struct fsl_mc_addr_translation_range **ranges, -uint8_t *num_ranges) +u8 *num_ranges) {int error;int paddr_cells;
drivers/staging/fsl-mc/bus/mc-sys.c +3 -3
@@ -52,7 +52,7 @@#define MC_CMD_COMPLETION_POLLING_MAX_SLEEP_USECS 500#define MC_CMD_HDR_READ_CMDID (_hdr) \ - ((uint16_t)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S)) + ((u16)mc_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S))/** * Creates an MC I/O object
@@ -69,9 +69,9 @@*/ int __must_check fsl_create_mc_io (struct device *dev,phys_addr_t mc_portal_phys_addr, -uint32_t mc_portal_size, +u32 mc_portal_size,struct fsl_mc_resource *resource, -uint32_t flags,struct fsl_mc_io **new_mc_io) +u32 flags,struct fsl_mc_io **new_mc_io) {struct fsl_mc_io *mc_io;void __iomem *mc_portal_virt_addr;
drivers/staging/fsl-mc/include/dpbp.h +54 -54
175 lines not on this page · raw message
drivers/staging/fsl-mc/include/dpmng.h +5 -5
@@ -53,17 +53,17 @@ struct fsl_mc_io;* and/or bug fixes that have no impact on API */ struct mc_version { -uint32_t major; -uint32_t minor; -uint32_t revision; +u32 major; +u32 minor; +u32 revision; };int mc_get_version (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, +u32 cmd_flags,struct mc_version *mc_ver_info);int dpmng_get_container_id (struct fsl_mc_io *mc_io, -uint32_t cmd_flags, +u32 cmd_flags,int *container_id);#endif /* __FSL_DPMNG_H */
drivers/staging/fsl-mc/include/dprc.h +106 -106
391 lines not on this page · raw message
drivers/staging/fsl-mc/include/mc-cmd.h +13 -13
@@ -35,21 +35,21 @@#define MC_CMD_NUM_OF_PARAMS 7#define MAKE_UMASK64 (_width) \ - ((uint64_t)((_width) < 64 ? ((uint64_t)1 << (_width)) - 1 : -1)) + ((u64)((_width) < 64 ? ((u64)1 << (_width)) - 1 : -1)) -static inline uint64_t mc_enc (int lsoffset,int width,uint64_t val) +static inline u64 mc_enc (int lsoffset,int width,u64 val) { -return (uint64_t )(((uint64_t )val &MAKE_UMASK64 (width)) << lsoffset); +return (u64)(((u64 )val &MAKE_UMASK64 (width)) << lsoffset); } -static inline uint64_t mc_dec (uint64_t val,int lsoffset,int width) +static inline u64 mc_dec (u64 val,int lsoffset,int width) { -return (uint64_t )((val >> lsoffset) &MAKE_UMASK64 (width)); +return (u64)((val >> lsoffset) &MAKE_UMASK64 (width)); }struct mc_command { -uint64_t header; -uint64_t params[MC_CMD_NUM_OF_PARAMS ]; +u64 header; +u64 params[MC_CMD_NUM_OF_PARAMS ]; };enum mc_cmd_status {
@@ -98,10 +98,10 @@ enum mc_cmd_status { MC_CMD_HDR_STATUS_O, MC_CMD_HDR_STATUS_S))#define MC_CMD_HDR_READ_TOKEN (_hdr) \ - ((uint16_t)mc_dec((_hdr), MC_CMD_HDR_TOKEN_O, MC_CMD_HDR_TOKEN_S)) + ((u16)mc_dec((_hdr), MC_CMD_HDR_TOKEN_O, MC_CMD_HDR_TOKEN_S))#define MC_CMD_HDR_READ_FLAGS (_hdr) \ - ((uint32_t)mc_dec((_hdr), MC_CMD_HDR_FLAGS_O, MC_CMD_HDR_FLAGS_S)) + ((u32)mc_dec((_hdr), MC_CMD_HDR_FLAGS_O, MC_CMD_HDR_FLAGS_S))#define MC_EXT_OP (_ext, _param, _offset, _width, _type, _arg) \ ((_ext)[_param] |= mc_enc((_offset), (_width), _arg))
@@ -112,11 +112,11 @@ enum mc_cmd_status {#define MC_RSP_OP (_cmd, _param, _offset, _width, _type, _arg) \ (_arg = (_type)mc_dec(_cmd.params[_param], (_offset), (_width))) -static inline uint64_t mc_encode_cmd_header (uint16_t cmd_id, -uint32_t cmd_flags, -uint16_t token) +static inline u64 mc_encode_cmd_header (u16 cmd_id, +u32 cmd_flags, +u16 token) { -uint64_t hdr; +u64 hdr; hdr =mc_enc (MC_CMD_HDR_CMDID_O ,MC_CMD_HDR_CMDID_S , cmd_id); hdr |= mc_enc(MC_CMD_HDR_FLAGS_O, MC_CMD_HDR_FLAGS_S,
drivers/staging/fsl-mc/include/mc-private.h +3 -3
@@ -34,7 +34,7 @@*/ struct fsl_mc {struct fsl_mc_device *root_mc_bus_dev; -uint8_t num_translation_ranges; +u8 num_translation_ranges;struct fsl_mc_addr_translation_range *translation_ranges; };
@@ -49,8 +49,8 @@ struct fsl_mc {*/ struct fsl_mc_addr_translation_range {enum dprc_region_type mc_region_type; -uint64_t start_mc_offset; -uint64_t end_mc_offset; +u64 start_mc_offset; +u64 end_mc_offset;phys_addr_t start_phys_addr; };
drivers/staging/fsl-mc/include/mc-sys.h +4 -4
@@ -56,8 +56,8 @@ struct mc_command;*/ struct fsl_mc_io {struct device *dev; -uint32_t flags; -uint32_t portal_size; +u32 flags; +u32 portal_size;phys_addr_t portal_phys_addr;void __iomem *portal_virt_addr;struct fsl_mc_resource *resource;
@@ -65,9 +65,9 @@ struct fsl_mc_io {int __must_check fsl_create_mc_io (struct device *dev,phys_addr_t mc_portal_phys_addr, -uint32_t mc_portal_size, +u32 mc_portal_size,struct fsl_mc_resource *resource, -uint32_t flags,struct fsl_mc_io **new_mc_io); +u32 flags,struct fsl_mc_io **new_mc_io);void fsl_destroy_mc_io (struct fsl_mc_io *mc_io);
drivers/staging/fsl-mc/include/mc.h +8 -8
@@ -59,10 +59,10 @@ struct fsl_mc_driver {* a MC object device driver. The last entry of the table has vendor set to 0x0 */ struct fsl_mc_device_match_id { -uint16_t vendor; +u16 vendor;const char obj_type[16 ]; -uint32_t ver_major; -uint32_t ver_minor; +u32 ver_major; +u32 ver_minor; };/**
@@ -148,10 +148,10 @@ struct fsl_mc_resource {*/ struct fsl_mc_device {struct device dev; -uint64_t dma_mask; -uint16_t flags; -uint16_t icid; -uint16_t mc_handle; +u64 dma_mask; +u16 flags; +u16 icid; +u16 mc_handle;struct fsl_mc_io *mc_io;struct dprc_obj_desc obj_desc;struct resource *regions;
@@ -183,7 +183,7 @@ int __must_check __fsl_mc_driver_register(struct fsl_mc_driver *fsl_mc_driver,void fsl_mc_driver_unregister (struct fsl_mc_driver *driver);int __must_check fsl_mc_portal_allocate (struct fsl_mc_device *mc_dev, -uint16_t mc_io_flags, +u16 mc_io_flags,struct fsl_mc_io **new_mc_io);void fsl_mc_portal_free (struct fsl_mc_io *mc_io);
--
2.3.3