staging: unisys: Remove VISORCHANNEL typedef (383df64e) · Commits · jan.koester / Linux

drivers/staging/unisys/visorchannel/visorchannel.h

+33 −34

Original line number	Original line	Diff line number	Diff line
	@@ -29,49 +29,48 @@
	#define BOOL int		#define BOOL int
	#endif		#endif

	/* VISORCHANNEL is an opaque structure to users.
	* Fields are declared only in the implementation .c files.
	*/
	typedef struct VISORCHANNEL_Tag VISORCHANNEL;

	/* Note that for visorchannel_create() and visorchannel_create_overlapped(),		/* Note that for visorchannel_create() and visorchannel_create_overlapped(),
	* <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.		* <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.
	* In this case, the values can simply be read from the channel header.		* In this case, the values can simply be read from the channel header.
	*/		*/
	VISORCHANNEL *visorchannel_create(HOSTADDRESS physaddr,		struct visorchannel *visorchannel_create(HOSTADDRESS physaddr,
	ulong channel_bytes, uuid_le guid);		ulong channel_bytes, uuid_le guid);
	VISORCHANNEL *visorchannel_create_overlapped(ulong channel_bytes,		struct visorchannel *visorchannel_create_overlapped(ulong channel_bytes,
	VISORCHANNEL *parent, ulong off,		struct visorchannel *parent,
			ulong off, uuid_le guid);
			struct visorchannel *visorchannel_create_with_lock(HOSTADDRESS physaddr,
			ulong channel_bytes,
	uuid_le guid);		uuid_le guid);
	VISORCHANNEL *visorchannel_create_with_lock(HOSTADDRESS physaddr,		struct visorchannel *visorchannel_create_overlapped_with_lock(
	ulong channel_bytes, uuid_le guid);		ulong channel_bytes,
	VISORCHANNEL *visorchannel_create_overlapped_with_lock(ulong channel_bytes,		struct visorchannel *parent,
	VISORCHANNEL *parent,
	ulong off, uuid_le guid);		ulong off, uuid_le guid);
	void visorchannel_destroy(VISORCHANNEL *channel);		void visorchannel_destroy(struct visorchannel *channel);
	int visorchannel_read(VISORCHANNEL *channel, ulong offset,		int visorchannel_read(struct visorchannel *channel, ulong offset,
	void *local, ulong nbytes);		void *local, ulong nbytes);
	int visorchannel_write(VISORCHANNEL *channel, ulong offset,		int visorchannel_write(struct visorchannel *channel, ulong offset,
	void *local, ulong nbytes);		void *local, ulong nbytes);
	int visorchannel_clear(VISORCHANNEL *channel, ulong offset,		int visorchannel_clear(struct visorchannel *channel, ulong offset,
	u8 ch, ulong nbytes);		u8 ch, ulong nbytes);
	BOOL visorchannel_signalremove(VISORCHANNEL channel, u32 queue, void msg);		BOOL visorchannel_signalremove(struct visorchannel *channel, u32 queue,
	BOOL visorchannel_signalinsert(VISORCHANNEL channel, u32 queue, void msg);		void *msg);
	int visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, u32 queue);		BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
	int visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, u32 queue);		void *msg);
			int visorchannel_signalqueue_slots_avail(struct visorchannel *channel,
	HOSTADDRESS visorchannel_get_physaddr(VISORCHANNEL *channel);		u32 queue);
	ulong visorchannel_get_nbytes(VISORCHANNEL *channel);		int visorchannel_signalqueue_max_slots(struct visorchannel *channel, u32 queue);
	char visorchannel_id(VISORCHANNEL channel, char *s);		HOSTADDRESS visorchannel_get_physaddr(struct visorchannel *channel);
	char visorchannel_zoneid(VISORCHANNEL channel, char *s);		ulong visorchannel_get_nbytes(struct visorchannel *channel);
	u64 visorchannel_get_clientpartition(VISORCHANNEL *channel);		char visorchannel_id(struct visorchannel channel, char *s);
	uuid_le visorchannel_get_uuid(VISORCHANNEL *channel);		char visorchannel_zoneid(struct visorchannel channel, char *s);
	struct memregion visorchannel_get_memregion(VISORCHANNEL channel);		u64 visorchannel_get_clientpartition(struct visorchannel *channel);
			uuid_le visorchannel_get_uuid(struct visorchannel *channel);
			struct memregion visorchannel_get_memregion(struct visorchannel channel);
	char visorchannel_uuid_id(uuid_le guid, char *s);		char visorchannel_uuid_id(uuid_le guid, char *s);
	void visorchannel_debug(VISORCHANNEL *channel, int num_queues,		void visorchannel_debug(struct visorchannel *channel, int num_queues,
	struct seq_file *seq, u32 off);		struct seq_file *seq, u32 off);
	void visorchannel_dump_section(VISORCHANNEL chan, char s,		void visorchannel_dump_section(struct visorchannel chan, char s,
	int off, int len, struct seq_file *seq);		int off, int len, struct seq_file *seq);
	void __iomem visorchannel_get_header(VISORCHANNEL channel);		void __iomem visorchannel_get_header(struct visorchannel channel);

	#endif		#endif

drivers/staging/unisys/visorchannel/visorchannel_funcs.c

+37 −35

Original line number	Original line	Diff line number	Diff line
	@@ -28,7 +28,7 @@

	#define MYDRVNAME "visorchannel"		#define MYDRVNAME "visorchannel"

	struct VISORCHANNEL_Tag {		struct visorchannel {
	struct memregion memregion; / from visor_memregion_create() */		struct memregion memregion; / from visor_memregion_create() */
	struct channel_header chan_hdr;		struct channel_header chan_hdr;
	uuid_le guid;		uuid_le guid;
	@@ -46,18 +46,18 @@ struct VISORCHANNEL_Tag {
	} safe_uis_queue;		} safe_uis_queue;
	};		};

	/* Creates the VISORCHANNEL abstraction for a data area in memory, but does		/* Creates the struct visorchannel abstraction for a data area in memory,
	* NOT modify this data area.		* but does NOT modify this data area.
	*/		*/
	static VISORCHANNEL *		static struct visorchannel *
	visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,		visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
	VISORCHANNEL *parent, ulong off, uuid_le guid,		struct visorchannel *parent, ulong off, uuid_le guid,
	BOOL needs_lock)		BOOL needs_lock)
	{		{
	VISORCHANNEL *p = NULL;		struct visorchannel *p = NULL;
	void *rc = NULL;		void *rc = NULL;

	p = kmalloc(sizeof(VISORCHANNEL), GFP_KERNEL\|__GFP_NORETRY);		p = kmalloc(sizeof(*p), GFP_KERNEL\|__GFP_NORETRY);
	if (p == NULL) {		if (p == NULL) {
	ERRDRV("allocation failed: (status=0)\n");		ERRDRV("allocation failed: (status=0)\n");
	rc = NULL;		rc = NULL;
	@@ -114,7 +114,7 @@ visorchannel_create_guts(HOSTADDRESS physaddr, ulong channel_bytes,
	return rc;		return rc;
	}		}

	VISORCHANNEL *		struct visorchannel *
	visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid)		visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid)
	{		{
	return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid,		return visorchannel_create_guts(physaddr, channel_bytes, NULL, 0, guid,
	@@ -122,7 +122,7 @@ visorchannel_create(HOSTADDRESS physaddr, ulong channel_bytes, uuid_le guid)
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_create);		EXPORT_SYMBOL_GPL(visorchannel_create);

	VISORCHANNEL *		struct visorchannel *
	visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes,		visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes,
	uuid_le guid)		uuid_le guid)
	{		{
	@@ -131,18 +131,19 @@ visorchannel_create_with_lock(HOSTADDRESS physaddr, ulong channel_bytes,
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_create_with_lock);		EXPORT_SYMBOL_GPL(visorchannel_create_with_lock);

	VISORCHANNEL *		struct visorchannel *
	visorchannel_create_overlapped(ulong channel_bytes,		visorchannel_create_overlapped(ulong channel_bytes,
	VISORCHANNEL *parent, ulong off, uuid_le guid)		struct visorchannel *parent, ulong off,
			uuid_le guid)
	{		{
	return visorchannel_create_guts(0, channel_bytes, parent, off, guid,		return visorchannel_create_guts(0, channel_bytes, parent, off, guid,
	FALSE);		FALSE);
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_create_overlapped);		EXPORT_SYMBOL_GPL(visorchannel_create_overlapped);

	VISORCHANNEL *		struct visorchannel *
	visorchannel_create_overlapped_with_lock(ulong channel_bytes,		visorchannel_create_overlapped_with_lock(ulong channel_bytes,
	VISORCHANNEL *parent, ulong off,		struct visorchannel *parent, ulong off,
	uuid_le guid)		uuid_le guid)
	{		{
	return visorchannel_create_guts(0, channel_bytes, parent, off, guid,		return visorchannel_create_guts(0, channel_bytes, parent, off, guid,
	@@ -151,7 +152,7 @@ visorchannel_create_overlapped_with_lock(ulong channel_bytes,
	EXPORT_SYMBOL_GPL(visorchannel_create_overlapped_with_lock);		EXPORT_SYMBOL_GPL(visorchannel_create_overlapped_with_lock);

	void		void
	visorchannel_destroy(VISORCHANNEL *channel)		visorchannel_destroy(struct visorchannel *channel)
	{		{
	if (channel == NULL)		if (channel == NULL)
	return;		return;
	@@ -164,14 +165,14 @@ visorchannel_destroy(VISORCHANNEL *channel)
	EXPORT_SYMBOL_GPL(visorchannel_destroy);		EXPORT_SYMBOL_GPL(visorchannel_destroy);

	HOSTADDRESS		HOSTADDRESS
	visorchannel_get_physaddr(VISORCHANNEL *channel)		visorchannel_get_physaddr(struct visorchannel *channel)
	{		{
	return visor_memregion_get_physaddr(channel->memregion);		return visor_memregion_get_physaddr(channel->memregion);
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_get_physaddr);		EXPORT_SYMBOL_GPL(visorchannel_get_physaddr);

	ulong		ulong
	visorchannel_get_nbytes(VISORCHANNEL *channel)		visorchannel_get_nbytes(struct visorchannel *channel)
	{		{
	return channel->size;		return channel->size;
	}		}
	@@ -186,42 +187,42 @@ visorchannel_uuid_id(uuid_le guid, char s)
	EXPORT_SYMBOL_GPL(visorchannel_uuid_id);		EXPORT_SYMBOL_GPL(visorchannel_uuid_id);

	char *		char *
	visorchannel_id(VISORCHANNEL channel, char s)		visorchannel_id(struct visorchannel channel, char s)
	{		{
	return visorchannel_uuid_id(&channel->guid, s);		return visorchannel_uuid_id(&channel->guid, s);
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_id);		EXPORT_SYMBOL_GPL(visorchannel_id);

	char *		char *
	visorchannel_zoneid(VISORCHANNEL channel, char s)		visorchannel_zoneid(struct visorchannel channel, char s)
	{		{
	return visorchannel_uuid_id(&channel->chan_hdr.zone_uuid, s);		return visorchannel_uuid_id(&channel->chan_hdr.zone_uuid, s);
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_zoneid);		EXPORT_SYMBOL_GPL(visorchannel_zoneid);

	HOSTADDRESS		HOSTADDRESS
	visorchannel_get_clientpartition(VISORCHANNEL *channel)		visorchannel_get_clientpartition(struct visorchannel *channel)
	{		{
	return channel->chan_hdr.partition_handle;		return channel->chan_hdr.partition_handle;
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_get_clientpartition);		EXPORT_SYMBOL_GPL(visorchannel_get_clientpartition);

	uuid_le		uuid_le
	visorchannel_get_uuid(VISORCHANNEL *channel)		visorchannel_get_uuid(struct visorchannel *channel)
	{		{
	return channel->guid;		return channel->guid;
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_get_uuid);		EXPORT_SYMBOL_GPL(visorchannel_get_uuid);

	struct memregion *		struct memregion *
	visorchannel_get_memregion(VISORCHANNEL *channel)		visorchannel_get_memregion(struct visorchannel *channel)
	{		{
	return channel->memregion;		return channel->memregion;
	}		}
	EXPORT_SYMBOL_GPL(visorchannel_get_memregion);		EXPORT_SYMBOL_GPL(visorchannel_get_memregion);

	int		int
	visorchannel_read(VISORCHANNEL *channel, ulong offset,		visorchannel_read(struct visorchannel *channel, ulong offset,
	void *local, ulong nbytes)		void *local, ulong nbytes)
	{		{
	int rc = visor_memregion_read(channel->memregion, offset,		int rc = visor_memregion_read(channel->memregion, offset,
	@@ -236,7 +237,7 @@ visorchannel_read(VISORCHANNEL *channel, ulong offset,
	EXPORT_SYMBOL_GPL(visorchannel_read);		EXPORT_SYMBOL_GPL(visorchannel_read);

	int		int
	visorchannel_write(VISORCHANNEL *channel, ulong offset,		visorchannel_write(struct visorchannel *channel, ulong offset,
	void *local, ulong nbytes)		void *local, ulong nbytes)
	{		{
	if (offset == 0 && nbytes >= sizeof(struct channel_header))		if (offset == 0 && nbytes >= sizeof(struct channel_header))
	@@ -247,7 +248,8 @@ visorchannel_write(VISORCHANNEL *channel, ulong offset,
	EXPORT_SYMBOL_GPL(visorchannel_write);		EXPORT_SYMBOL_GPL(visorchannel_write);

	int		int
	visorchannel_clear(VISORCHANNEL *channel, ulong offset, u8 ch, ulong nbytes)		visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch,
			ulong nbytes)
	{		{
	int rc = -1;		int rc = -1;
	int bufsize = 65536;		int bufsize = 65536;
	@@ -286,7 +288,7 @@ visorchannel_clear(VISORCHANNEL *channel, ulong offset, u8 ch, ulong nbytes)
	EXPORT_SYMBOL_GPL(visorchannel_clear);		EXPORT_SYMBOL_GPL(visorchannel_clear);

	void __iomem *		void __iomem *
	visorchannel_get_header(VISORCHANNEL *channel)		visorchannel_get_header(struct visorchannel *channel)
	{		{
	return (void __iomem *)&channel->chan_hdr;		return (void __iomem *)&channel->chan_hdr;
	}		}
	@@ -317,7 +319,7 @@ EXPORT_SYMBOL_GPL(visorchannel_get_header);
	sizeof((sig_hdr)->FIELD)) >= 0)		sizeof((sig_hdr)->FIELD)) >= 0)

	static BOOL		static BOOL
	sig_read_header(VISORCHANNEL *channel, u32 queue,		sig_read_header(struct visorchannel *channel, u32 queue,
	struct signal_queue_header *sig_hdr)		struct signal_queue_header *sig_hdr)
	{		{
	BOOL rc = FALSE;		BOOL rc = FALSE;
	@@ -345,7 +347,7 @@ sig_read_header(VISORCHANNEL *channel, u32 queue,
	}		}

	static BOOL		static BOOL
	sig_do_data(VISORCHANNEL *channel, u32 queue,		sig_do_data(struct visorchannel *channel, u32 queue,
	struct signal_queue_header sig_hdr, u32 slot, void data,		struct signal_queue_header sig_hdr, u32 slot, void data,
	BOOL is_write)		BOOL is_write)
	{		{
	@@ -374,14 +376,14 @@ sig_do_data(VISORCHANNEL *channel, u32 queue,
	}		}

	static inline BOOL		static inline BOOL
	sig_read_data(VISORCHANNEL *channel, u32 queue,		sig_read_data(struct visorchannel *channel, u32 queue,
	struct signal_queue_header sig_hdr, u32 slot, void data)		struct signal_queue_header sig_hdr, u32 slot, void data)
	{		{
	return sig_do_data(channel, queue, sig_hdr, slot, data, FALSE);		return sig_do_data(channel, queue, sig_hdr, slot, data, FALSE);
	}		}

	static inline BOOL		static inline BOOL
	sig_write_data(VISORCHANNEL *channel, u32 queue,		sig_write_data(struct visorchannel *channel, u32 queue,
	struct signal_queue_header sig_hdr, u32 slot, void data)		struct signal_queue_header sig_hdr, u32 slot, void data)
	{		{
	return sig_do_data(channel, queue, sig_hdr, slot, data, TRUE);		return sig_do_data(channel, queue, sig_hdr, slot, data, TRUE);
	@@ -410,7 +412,7 @@ safe_sig_queue_validate(struct signal_queue_header *psafe_sqh,
	} /* end safe_sig_queue_validate */		} /* end safe_sig_queue_validate */

	BOOL		BOOL
	visorchannel_signalremove(VISORCHANNEL channel, u32 queue, void msg)		visorchannel_signalremove(struct visorchannel channel, u32 queue, void msg)
	{		{
	BOOL rc = FALSE;		BOOL rc = FALSE;
	struct signal_queue_header sig_hdr;		struct signal_queue_header sig_hdr;
	@@ -457,7 +459,7 @@ visorchannel_signalremove(VISORCHANNEL channel, u32 queue, void msg)
	EXPORT_SYMBOL_GPL(visorchannel_signalremove);		EXPORT_SYMBOL_GPL(visorchannel_signalremove);

	BOOL		BOOL
	visorchannel_signalinsert(VISORCHANNEL channel, u32 queue, void msg)		visorchannel_signalinsert(struct visorchannel channel, u32 queue, void msg)
	{		{
	BOOL rc = FALSE;		BOOL rc = FALSE;
	struct signal_queue_header sig_hdr;		struct signal_queue_header sig_hdr;
	@@ -512,7 +514,7 @@ visorchannel_signalinsert(VISORCHANNEL channel, u32 queue, void msg)
	EXPORT_SYMBOL_GPL(visorchannel_signalinsert);		EXPORT_SYMBOL_GPL(visorchannel_signalinsert);

	int		int
	visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, u32 queue)		visorchannel_signalqueue_slots_avail(struct visorchannel *channel, u32 queue)
	{		{
	struct signal_queue_header sig_hdr;		struct signal_queue_header sig_hdr;
	u32 slots_avail, slots_used;		u32 slots_avail, slots_used;
	@@ -531,7 +533,7 @@ visorchannel_signalqueue_slots_avail(VISORCHANNEL *channel, u32 queue)
	EXPORT_SYMBOL_GPL(visorchannel_signalqueue_slots_avail);		EXPORT_SYMBOL_GPL(visorchannel_signalqueue_slots_avail);

	int		int
	visorchannel_signalqueue_max_slots(VISORCHANNEL *channel, u32 queue)		visorchannel_signalqueue_max_slots(struct visorchannel *channel, u32 queue)
	{		{
	struct signal_queue_header sig_hdr;		struct signal_queue_header sig_hdr;

	@@ -566,7 +568,7 @@ sigqueue_debug(struct signal_queue_header q, int which, struct seq_file seq)
	}		}

	void		void
	visorchannel_debug(VISORCHANNEL *channel, int num_queues,		visorchannel_debug(struct visorchannel *channel, int num_queues,
	struct seq_file *seq, u32 off)		struct seq_file *seq, u32 off)
	{		{
	HOSTADDRESS addr = 0;		HOSTADDRESS addr = 0;
	@@ -648,7 +650,7 @@ visorchannel_debug(VISORCHANNEL *channel, int num_queues,
	EXPORT_SYMBOL_GPL(visorchannel_debug);		EXPORT_SYMBOL_GPL(visorchannel_debug);

	void		void
	visorchannel_dump_section(VISORCHANNEL chan, char s,		visorchannel_dump_section(struct visorchannel chan, char s,
	int off, int len, struct seq_file *seq)		int off, int len, struct seq_file *seq)
	{		{
	char buf, tbuf, *fmtbuf;		char buf, tbuf, *fmtbuf;

drivers/staging/unisys/visorchipset/file.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@
	#define CURRENT_FILE_PC VISOR_CHIPSET_PC_file_c		#define CURRENT_FILE_PC VISOR_CHIPSET_PC_file_c

	static struct cdev file_cdev;		static struct cdev file_cdev;
	static VISORCHANNEL **file_controlvm_channel;		static struct visorchannel **file_controlvm_channel;
	static dev_t majordev = -1; /*< indicates major num for device /		static dev_t majordev = -1; /*< indicates major num for device /
	static BOOL registered = FALSE;		static BOOL registered = FALSE;

	@@ -48,7 +48,8 @@ static const struct file_operations visorchipset_fops = {
	.mmap = visorchipset_mmap,		.mmap = visorchipset_mmap,
	};		};

	int visorchipset_file_init(dev_t major_dev, VISORCHANNEL **controlvm_channel)		int
			visorchipset_file_init(dev_t major_dev, struct visorchannel **controlvm_channel)
	{		{
	int rc = 0;		int rc = 0;

drivers/staging/unisys/visorchipset/file.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,8 @@

	#include "globals.h"		#include "globals.h"

	int visorchipset_file_init(dev_t major_dev, VISORCHANNEL **controlvm_channel);		int visorchipset_file_init(dev_t majorDev,
			struct visorchannel **pControlVm_channel);
	void visorchipset_file_cleanup(void);		void visorchipset_file_cleanup(void);

	#endif		#endif

drivers/staging/unisys/visorchipset/visorchipset_main.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -101,7 +101,7 @@ static struct controlvm_message_packet g_DeviceChangeStatePacket;
	static LIST_HEAD(BusInfoList);		static LIST_HEAD(BusInfoList);
	static LIST_HEAD(DevInfoList);		static LIST_HEAD(DevInfoList);

	static VISORCHANNEL *ControlVm_channel;		static struct visorchannel *ControlVm_channel;

	typedef struct {		typedef struct {
	u8 __iomem ptr; / pointer to base address of payload pool */		u8 __iomem ptr; / pointer to base address of payload pool */