Skip to content

Commit

Permalink
Fix function prototype mismatch with uio_info release function
Browse files Browse the repository at this point in the history
Addition of user information to release function of uio_info structure
is not taken care in all drivers resulting in build error.

Fix the issue by updating the release function with user information
argument.

Tests done:
Host and Guest kernel builds without any error in UIO drivers.

Tracked-On: OAM-115388
Signed-off-by: Jeevaka Prabu Badrappan <[email protected]>
  • Loading branch information
JeevakaPrabu authored and sysopenci committed Jan 29, 2024
1 parent e23e64d commit 61185da
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/broadcom/cnic.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static int cnic_uio_open(struct uio_info *uinfo, struct inode *inode)
return 0;
}

static int cnic_uio_close(struct uio_info *uinfo, struct inode *inode)
static int cnic_uio_close(struct uio_info *uinfo, struct inode *inode, unsigned long user)
{
struct cnic_uio_dev *udev = uinfo->priv;

Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/qedi/qedi_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int qedi_uio_open(struct uio_info *uinfo, struct inode *inode)
return 0;
}

static int qedi_uio_close(struct uio_info *uinfo, struct inode *inode)
static int qedi_uio_close(struct uio_info *uinfo, struct inode *inode, unsigned long user)
{
struct qedi_uio_dev *udev = uinfo->priv;
struct qedi_ctx *qedi = udev->qedi;
Expand Down
2 changes: 1 addition & 1 deletion drivers/target/target_core_user.c
Original file line number Diff line number Diff line change
Expand Up @@ -1956,7 +1956,7 @@ static int tcmu_open(struct uio_info *info, struct inode *inode)
return 0;
}

static int tcmu_release(struct uio_info *info, struct inode *inode)
static int tcmu_release(struct uio_info *info, struct inode *inode, unsigned long user)
{
struct tcmu_dev *udev = container_of(info, struct tcmu_dev, uio_info);
struct tcmu_cmd *cmd;
Expand Down
2 changes: 1 addition & 1 deletion drivers/uio/uio_dmem_genirq.c
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ static int uio_dmem_genirq_open(struct uio_info *info, struct inode *inode)
return 0;
}

static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode)
static int uio_dmem_genirq_release(struct uio_info *info, struct inode *inode, unsigned long user)
{
struct uio_dmem_genirq_platdata *priv = info->priv;
struct uio_mem *uiomem;
Expand Down
2 changes: 1 addition & 1 deletion drivers/uio/uio_hv_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ hv_uio_open(struct uio_info *info, struct inode *inode)

/* VMBus primary channel is closed on last close */
static int
hv_uio_release(struct uio_info *info, struct inode *inode)
hv_uio_release(struct uio_info *info, struct inode *inode, unsigned long user)
{
struct hv_uio_private_data *pdata
= container_of(info, struct hv_uio_private_data, info);
Expand Down
2 changes: 1 addition & 1 deletion drivers/uio/uio_pdrv_genirq.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static int uio_pdrv_genirq_open(struct uio_info *info, struct inode *inode)
return 0;
}

static int uio_pdrv_genirq_release(struct uio_info *info, struct inode *inode)
static int uio_pdrv_genirq_release(struct uio_info *info, struct inode *inode, unsigned long user)
{
struct uio_pdrv_genirq_platdata *priv = info->priv;

Expand Down

0 comments on commit 61185da

Please sign in to comment.