Commit 90476670 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman
Browse files

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: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarTim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cb3b5dcc

drivers/staging/unisys/visorbus/visorbus_private.h

+1 −3
Original line number Diff line number Diff line
@@ -39,9 +39,7 @@ void visorbus_exit(void); 


/* visorchannel access functions */

struct visorchannel *visorchannel_create(u64 physaddr, gfp_t gfp,

					 const guid_t *guid);

struct visorchannel *visorchannel_create_with_lock(u64 physaddr, gfp_t gfp,

						   const guid_t *guid);

					 const guid_t *guid, bool needs_lock);

void visorchannel_destroy(struct visorchannel *channel);

int visorchannel_read(struct visorchannel *channel, ulong offset,

		      void *dest, ulong nbytes);

drivers/staging/unisys/visorbus/visorchannel.c

+5 −18
Original line number Diff line number Diff line
@@ -342,9 +342,9 @@ static int signalinsert_inner(struct visorchannel *channel, u32 queue, 
}



/*

 * visorchannel_create_guts() - creates the struct visorchannel abstraction for

 *				a data area in memory, but does NOT modify this

 *				data area

 * visorchannel_create() - creates the struct visorchannel abstraction for a

 *                         data area in memory, but does NOT modify this data

 *                         area

 * @physaddr:      physical address of start of channel

 * @gfp:           gfp_t to use when allocating memory for the data struct

 * @guid:          GUID that identifies channel type;
@@ -355,9 +355,8 @@ static int signalinsert_inner(struct visorchannel *channel, u32 queue, 
 * Return: pointer to visorchannel that was created if successful,

 *         otherwise NULL

 */

static struct visorchannel *visorchannel_create_guts(u64 physaddr, gfp_t gfp,

						     const guid_t *guid,

						     bool needs_lock)

struct visorchannel *visorchannel_create(u64 physaddr, gfp_t gfp,

					 const guid_t *guid, bool needs_lock)

{

	struct visorchannel *channel;

	int err;
@@ -416,18 +415,6 @@ err_destroy_channel: 
	return NULL;

}



struct visorchannel *visorchannel_create(u64 physaddr, gfp_t gfp,

					 const guid_t *guid)

{

	return visorchannel_create_guts(physaddr, gfp, guid, false);

}



struct visorchannel *visorchannel_create_with_lock(u64 physaddr, gfp_t gfp,

						   const guid_t *guid)

{

	return visorchannel_create_guts(physaddr, gfp, guid, true);

}



/**

 * visorchannel_signalinsert() - inserts a message into the designated

 *                               channel/queue

drivers/staging/unisys/visorbus/visorchipset.c

+8 −7
Original line number Diff line number Diff line
@@ -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,

	visorchannel = visorchannel_create(cmd->create_device.channel_addr,

					   GFP_KERNEL,

					     &cmd->create_device.data_type_guid);

					   &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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE