Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vcsm: rpi-4.19.y - gcc-v8 fixes #2897

Merged
merged 3 commits into from
Mar 19, 2019
Merged

vcsm: rpi-4.19.y - gcc-v8 fixes #2897

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af9fd01
vcsm: Fix makefile include on out-of-tree builds
kbingham Mar 18, 2019
da30285
vcsm: Remove set but unused variable
kbingham Mar 18, 2019
f24d331
vcsm: Reduce scope of local functions
kbingham Mar 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion drivers/char/broadcom/vc_sm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ccflags-$(CONFIG_BCM_VC_SM) += -Werror -Wall -Wstrict-prototypes -Wno-trigraphs -O2
ccflags-$(CONFIG_BCM_VC_SM) += -I"drivers/staging/vc04_services" -I"drivers/staging/vc04_services/interface/vchi" -I"drivers/staging/vc04_services/interface/vchiq_arm" -I"$(srctree)/fs/"
ccflags-$(CONFIG_BCM_VC_SM) += -I"drivers/staging/vc04_services" -I"drivers/staging/vc04_services/interface/vchi" -I"drivers/staging/vc04_services/interface/vchiq_arm" -I"fs"
ccflags-$(CONFIG_BCM_VC_SM) += -DOS_ASSERT_FAILURE -D__STDC_VERSION=199901L -D__STDC_VERSION__=199901L -D__VCCOREVER__=0 -D__KERNEL__ -D__linux__

obj-$(CONFIG_BCM_VC_SM) := vc-sm.o
Expand Down
6 changes: 2 additions & 4 deletions drivers/char/broadcom/vc_sm/vc_vchi_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,9 @@ int vc_vchi_sm_stop(struct sm_instance **handle)

/* Close all VCHI service connections */
for (i = 0; i < instance->num_connections; i++) {
int32_t success;

vchi_service_use(instance->vchi_handle[i]);

success = vchi_service_close(instance->vchi_handle[i]);
vchi_service_close(instance->vchi_handle[i]);
}

kfree(instance);
Expand All @@ -377,7 +375,7 @@ int vc_vchi_sm_stop(struct sm_instance **handle)
return -EINVAL;
}

int vc_vchi_sm_send_msg(struct sm_instance *handle,
static int vc_vchi_sm_send_msg(struct sm_instance *handle,
enum vc_sm_msg_type msg_id,
void *msg, uint32_t msg_size,
void *result, uint32_t result_size,
Expand Down
14 changes: 7 additions & 7 deletions drivers/char/broadcom/vc_sm/vmcs_sm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,8 +1574,8 @@ static int vc_sm_mmap(struct file *file, struct vm_area_struct *vma)
}

/* Allocate a shared memory handle and block. */
int vc_sm_ioctl_alloc(struct sm_priv_data_t *private,
struct vmcs_sm_ioctl_alloc *ioparam)
static int vc_sm_ioctl_alloc(struct sm_priv_data_t *private,
struct vmcs_sm_ioctl_alloc *ioparam)
{
int ret = 0;
int status;
Expand Down Expand Up @@ -1685,8 +1685,8 @@ int vc_sm_ioctl_alloc(struct sm_priv_data_t *private,
}

/* Share an allocate memory handle and block.*/
int vc_sm_ioctl_alloc_share(struct sm_priv_data_t *private,
struct vmcs_sm_ioctl_alloc_share *ioparam)
static int vc_sm_ioctl_alloc_share(struct sm_priv_data_t *private,
struct vmcs_sm_ioctl_alloc_share *ioparam)
{
struct sm_resource_t *resource, *shared_resource;
int ret = 0;
Expand Down Expand Up @@ -2200,9 +2200,9 @@ static int vc_sm_ioctl_unlock(struct sm_priv_data_t *private,
}

/* Import a contiguous block of memory to be shared with VC. */
int vc_sm_ioctl_import_dmabuf(struct sm_priv_data_t *private,
struct vmcs_sm_ioctl_import_dmabuf *ioparam,
struct dma_buf *src_dma_buf)
static int vc_sm_ioctl_import_dmabuf(struct sm_priv_data_t *private,
struct vmcs_sm_ioctl_import_dmabuf *ioparam,
struct dma_buf *src_dma_buf)
{
int ret = 0;
int status;
Expand Down