Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5577d79 authored by David Kershner's avatar David Kershner Committed by Greg Kroah-Hartman
Browse files

staging: unisys: visorbus: move bus_device_info_init to visorbus_main.c 



The function bus_device_info_init was defined in visorbus_private.h. The
only file that uses it is visorbus_main.c so move the function into the .c
file instead.

Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Reviewed-by: default avatarReviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c53578bd

drivers/staging/unisys/visorbus/visorbus_main.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -763,6 +763,22 @@ write_vbus_dev_info(struct visorchannel *chan, 
	visorchannel_write(chan, off, info, sizeof(*info));

	visorchannel_write(chan, off, info, sizeof(*info));

}

}





static void bus_device_info_init(

		struct ultra_vbus_deviceinfo *bus_device_info_ptr,

		const char *dev_type, const char *drv_name)

{

	memset(bus_device_info_ptr, 0, sizeof(struct ultra_vbus_deviceinfo));

	snprintf(bus_device_info_ptr->devtype,

		 sizeof(bus_device_info_ptr->devtype),

		 "%s", (dev_type) ? dev_type : "unknownType");

	snprintf(bus_device_info_ptr->drvname,

		 sizeof(bus_device_info_ptr->drvname),

		 "%s", (drv_name) ? drv_name : "unknownDriver");

	snprintf(bus_device_info_ptr->infostrs,

		 sizeof(bus_device_info_ptr->infostrs), "kernel ver. %s",

		 utsname()->release);

}



/*

/*

 * fix_vbus_dev_info() - for a child device just created on a client bus, fill

 * fix_vbus_dev_info() - for a child device just created on a client bus, fill

 *                       in information about the driver that is controlling

 *                       in information about the driver that is controlling

drivers/staging/unisys/visorbus/visorbus_private.h

+0 −16
Original line number Original line Diff line number Diff line
@@ -27,22 +27,6 @@ 
 * command line

 * command line

 */

 */





static inline void bus_device_info_init(

		struct ultra_vbus_deviceinfo *bus_device_info_ptr,

		const char *dev_type, const char *drv_name)

{

	memset(bus_device_info_ptr, 0, sizeof(struct ultra_vbus_deviceinfo));

	snprintf(bus_device_info_ptr->devtype,

		 sizeof(bus_device_info_ptr->devtype),

		 "%s", (dev_type) ? dev_type : "unknownType");

	snprintf(bus_device_info_ptr->drvname,

		 sizeof(bus_device_info_ptr->drvname),

		 "%s", (drv_name) ? drv_name : "unknownDriver");

	snprintf(bus_device_info_ptr->infostrs,

		 sizeof(bus_device_info_ptr->infostrs), "kernel ver. %s",

		 utsname()->release);

}



void chipset_bus_create(struct visor_device *bus_info);

void chipset_bus_create(struct visor_device *bus_info);

void chipset_bus_destroy(struct visor_device *bus_info);

void chipset_bus_destroy(struct visor_device *bus_info);

void chipset_device_create(struct visor_device *dev_info);

void chipset_device_create(struct visor_device *dev_info);