diff options
| author | Sameer Wadgaonkar | 2017-09-27 19:14:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-09-28 11:20:21 +0200 |
| commit | 90476670abec373557a6bff6a43b6e490c02e4ec (patch) | |
| tree | 0562733c93d00d6f587da1505f4f829b15b8c5e6 /drivers/staging/unisys/visorbus/visorchipset.c | |
| parent | staging: unisys: check the whole channel instead of just guid for match (diff) | |
| download | kernel-qcow2-linux-90476670abec373557a6bff6a43b6e490c02e4ec.tar.gz kernel-qcow2-linux-90476670abec373557a6bff6a43b6e490c02e4ec.tar.xz kernel-qcow2-linux-90476670abec373557a6bff6a43b6e490c02e4ec.zip | |
staging: unisys: visorbus: simplify visorchannel_create_guts
Removing the two wrapper functions dealing with visorchannel_create() and
instead just always use a new version of visorchannel_create() with an
additional parameter.
Signed-off-by: Sameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/visorbus/visorchipset.c')
| -rw-r--r-- | drivers/staging/unisys/visorbus/visorchipset.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/staging/unisys/visorbus/visorchipset.c b/drivers/staging/unisys/visorbus/visorchipset.c index c876e5420be9..027e10f2f0e6 100644 --- a/drivers/staging/unisys/visorbus/visorchipset.c +++ b/drivers/staging/unisys/visorbus/visorchipset.c @@ -494,7 +494,8 @@ static int visorbus_create(struct controlvm_message *inmsg) } visorchannel = visorchannel_create(cmd->create_bus.channel_addr, GFP_KERNEL, - &cmd->create_bus.bus_data_type_guid); + &cmd->create_bus.bus_data_type_guid, + false); if (!visorchannel) { err = -ENOMEM; goto err_free_pending_msg; @@ -681,10 +682,10 @@ static int visorbus_device_create(struct controlvm_message *inmsg) dev_info->chipset_dev_no = dev_no; guid_copy(&dev_info->inst, &cmd->create_device.dev_inst_guid); dev_info->device.parent = &bus_info->device; - visorchannel = - visorchannel_create_with_lock(cmd->create_device.channel_addr, - GFP_KERNEL, - &cmd->create_device.data_type_guid); + visorchannel = visorchannel_create(cmd->create_device.channel_addr, + GFP_KERNEL, + &cmd->create_device.data_type_guid, + true); if (!visorchannel) { dev_err(&chipset_dev->acpi_device->dev, "failed to create visorchannel: %d/%d\n", @@ -1203,8 +1204,8 @@ static int controlvm_channel_create(struct visorchipset_device *dev) if (err) return err; addr = dev->controlvm_params.address; - chan = visorchannel_create_with_lock(addr, GFP_KERNEL, - &visor_controlvm_channel_guid); + chan = visorchannel_create(addr, GFP_KERNEL, + &visor_controlvm_channel_guid, true); if (!chan) return -ENOMEM; dev->controlvm_channel = chan; |