@@ -9,7 +9,7 @@
struct bcm2835_audio_instance {
struct device *dev;
- unsigned service_handle;
+ unsigned int service_handle;
struct completion msg_avail_comp;
struct mutex vchi_mutex;
struct bcm2835_alsa_stream *alsa_stream;
@@ -91,7 +91,7 @@ static int bcm2835_audio_send_simple(struct bcm2835_audio_instance *instance,
static enum vchiq_status audio_vchi_callback(enum vchiq_reason reason,
struct vchiq_header *header,
- unsigned handle, void *userdata)
+ unsigned int handle, void *userdata)
{
struct bcm2835_audio_instance *instance = vchiq_get_service_userdata(handle);
struct vc_audio_msg *m;
@@ -84,11 +84,11 @@ extern enum vchiq_status vchiq_open_service(struct vchiq_instance *instance,
extern enum vchiq_status vchiq_close_service(unsigned int service);
extern enum vchiq_status vchiq_use_service(unsigned int service);
extern enum vchiq_status vchiq_release_service(unsigned int service);
-extern void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header);
+extern void vchiq_msg_queue_push(unsigned int handle, struct vchiq_header *header);
extern void vchiq_release_message(unsigned int service,
struct vchiq_header *header);
-extern int vchiq_queue_kernel_message(unsigned handle, void *data,
- unsigned size);
+extern int vchiq_queue_kernel_message(unsigned int handle, void *data,
+ unsigned int size);
extern enum vchiq_status vchiq_bulk_transmit(unsigned int service,
const void *data, unsigned int size, void *userdata,
enum vchiq_bulk_mode mode);
@@ -98,6 +98,6 @@ extern enum vchiq_status vchiq_bulk_receive(unsigned int service,
extern void *vchiq_get_service_userdata(unsigned int service);
extern enum vchiq_status vchiq_get_peer_version(unsigned int handle,
short *peer_version);
-extern struct vchiq_header *vchiq_msg_hold(unsigned handle);
+extern struct vchiq_header *vchiq_msg_hold(unsigned int handle);
#endif /* VCHIQ_H */
@@ -2275,7 +2275,7 @@ vchiq_init_state(struct vchiq_state *state, struct vchiq_slot_zero *slot_zero)
return VCHIQ_ERROR;
}
-void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header)
+void vchiq_msg_queue_push(unsigned int handle, struct vchiq_header *header)
{
struct vchiq_service *service = find_service_by_handle(handle);
int pos;
@@ -2293,7 +2293,7 @@ void vchiq_msg_queue_push(unsigned handle, struct vchiq_header *header)
}
EXPORT_SYMBOL(vchiq_msg_queue_push);
-struct vchiq_header *vchiq_msg_hold(unsigned handle)
+struct vchiq_header *vchiq_msg_hold(unsigned int handle)
{
struct vchiq_service *service = find_service_by_handle(handle);
struct vchiq_header *header;
@@ -3214,7 +3214,7 @@ vchiq_queue_message(unsigned int handle,
return status;
}
-int vchiq_queue_kernel_message(unsigned handle, void *data, unsigned size)
+int vchiq_queue_kernel_message(unsigned int handle, void *data, unsigned int size)
{
enum vchiq_status status;
@@ -163,7 +163,7 @@ struct mmal_msg_context {
};
struct vchiq_mmal_instance {
- unsigned service_handle;
+ unsigned int service_handle;
/* ensure serialised access to service */
struct mutex vchiq_mutex;
@@ -548,7 +548,7 @@ static void bulk_abort_cb(struct vchiq_mmal_instance *instance,
/* incoming event service callback */
static enum vchiq_status service_callback(enum vchiq_reason reason,
struct vchiq_header *header,
- unsigned handle, void *bulk_ctx)
+ unsigned int handle, void *bulk_ctx)
{
struct vchiq_mmal_instance *instance = vchiq_get_service_userdata(handle);
u32 msg_len;
This patch fixes the checkpatch.pl warning: WARNING: Prefer 'unsigned int' to bare use of 'unsigned' Signed-off-by: Baidyanath Kundu <kundubaidya99@gmail.com> --- .../staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c | 4 ++-- .../vc04_services/include/linux/raspberrypi/vchiq.h | 8 ++++---- .../vc04_services/interface/vchiq_arm/vchiq_core.c | 6 +++--- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-)