Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

wigig_sensing: change change_mode ioctl signature

Browse source 
The new definition separates error code report from burst_size. This
promotes uniformity in the ioctl definitions and prevents the usage of
errno.

Change-Id: I2145a8ba15cb25a82c1d1a4d4c3465e56f4358d6
Signed-off-by: Gidon Studinski <gidons@codeaurora.org>
This commit is contained in:
Gidon Studinski 2019-12-11 17:35:43 +02:00
parent f87f3ea293
commit 60ca6eee8e
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
drivers/misc/wigig_sensing.c
View file

@ -514,22 +514,25 @@ static int wigig_sensing_ioc_get_mode(struct wigig_sensing_ctx *ctx)
}
static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx,
struct wigig_sensing_change_mode req)
struct wigig_sensing_change_mode *req)
{
struct wigig_sensing_stm sim_state;
int rc;
u32 ch;
if (req == NULL)
return -EINVAL;
pr_info("mode = %d, channel = %d, has_channel = %d\n",
req.mode, req.channel, req.has_channel);
req->mode, req->channel, req->has_channel);
if (!ctx)
return -EINVAL;
/* Save the request for later use */
ctx->stm.mode_request = req.mode;
ctx->stm.mode_request = req->mode;
/* Simulate a state change */
ctx->stm.state_request = convert_mode_to_state(req.mode);
ctx->stm.state_request = convert_mode_to_state(req->mode);
sim_state = ctx->stm;
rc = wigig_sensing_change_state(ctx, &sim_state,
ctx->stm.state_request);
@ -541,11 +544,11 @@ static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx,
/* Send command to FW */
mutex_lock(&ctx->dri_lock);
ctx->stm.change_mode_in_progress = true;
ch = req.has_channel ? req.channel : 0;
ch = req->has_channel ? req->channel : 0;
ctx->stm.channel_request = ch;
ctx->stm.burst_size_ready = false;
/* Change mode command must not be called during DRI processing */
rc = wigig_sensing_send_change_mode_command(ctx, req.mode, ch);
rc = wigig_sensing_send_change_mode_command(ctx, req->mode, ch);
mutex_unlock(&ctx->dri_lock);
if (rc) {
pr_err("wigig_sensing_send_change_mode_command() failed, err %d\n",
@ -585,7 +588,9 @@ static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx,
ctx->stm.state_request = WIGIG_SENSING_STATE_MIN;
ctx->stm.channel_request = 0;
ctx->stm.mode_request = WIGIG_SENSING_MODE_STOP;
return (rc == 0) ? ctx->stm.burst_size : rc;
req->burst_size = ctx->stm.burst_size;
return rc;
}
static int wigig_sensing_ioc_clear_data(struct wigig_sensing_ctx *ctx)
@ -808,7 +813,11 @@ static long wigig_sensing_ioctl(struct file *file, unsigned int cmd,
if (copy_from_user(&req, (void *)arg, sizeof(req)))
return -EFAULT;
rc = wigig_sensing_ioc_change_mode(ctx, req);
rc = wigig_sensing_ioc_change_mode(ctx, &req);
if (copy_to_user((void *)arg, &req, sizeof(req)))
return -EFAULT;
break;
}
case WIGIG_SENSING_IOCTL_CLEAR_DATA:
@ -1476,10 +1485,11 @@ static int wigig_sensing_remove(struct spi_device *spi)
.mode = WIGIG_SENSING_MODE_STOP,
.has_channel = false,
.channel = 0,
.burst_size = 0,
};
/* Make sure that FW is in STOP mode */
wigig_sensing_ioc_change_mode(ctx, req);
wigig_sensing_ioc_change_mode(ctx, &req);
device_destroy(ctx->class, ctx->wigig_sensing_dev);
unregister_chrdev_region(ctx->wigig_sensing_dev, 1);

1
include/uapi/misc/wigig_sensing_uapi.h
View file

@ -24,6 +24,7 @@ struct wigig_sensing_change_mode {
enum wigig_sensing_mode mode;
bool has_channel;
uint32_t channel;
uint32_t burst_size;
};
enum wigig_sensing_event {