All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/9] staging: unisys: visorbus cleanup series
@ 2015-10-12 19:19 Benjamin Romer
  2015-10-12 19:19 ` [PATCH 1/9] staging: unisys: channel.h covert from pragma to __packed Benjamin Romer
                   ` (8 more replies)
  0 siblings, 9 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

This patch series fixes incorrect pragma statements, cleans up some
formatting problems, and removes disused fields from header files.

David Kershner (9):
  staging: unisys: channel.h covert from pragma to __packed
  staging: unisys: channel.h Fix spacing around operands.
  staging: unisys: visorchannel.c fix spacing around cast
  staging: unisys: visorchannel.c remove unneeded parenthesis
  staging: unisys: periodic_work.h Fix parenthesis alignment
  staging: unisys: periodic_work.h Fix spacing
  staging: unisys: diagchannel.h: get rid of unused fields
  staging: unisys: vmcallinterface.h: Cleanup unused fields
  staging: unisys: vmcallinterface.h: convert pragma to __packed

 drivers/staging/unisys/include/channel.h          | 19 ++++-----
 drivers/staging/unisys/include/diagchannel.h      |  5 ---
 drivers/staging/unisys/include/periodic_work.h    | 12 +++---
 drivers/staging/unisys/visorbus/visorchannel.c    |  8 ++--
 drivers/staging/unisys/visorbus/vmcallinterface.h | 50 +----------------------
 5 files changed, 19 insertions(+), 75 deletions(-)

-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 1/9] staging: unisys: channel.h covert from pragma to __packed
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 2/9] staging: unisys: channel.h Fix spacing around operands Benjamin Romer
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Need to convert from #pragma to __packed for channel structures.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/channel.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/channel.h
index da0b538..698adeb 100644
--- a/drivers/staging/unisys/include/channel.h
+++ b/drivers/staging/unisys/include/channel.h
@@ -152,7 +152,6 @@ ULTRA_CHANNELCLI_STRING(u32 v)
 #define ULTRA_IO_DRIVER_DISABLES_INTS (0x1ULL << 5)
 #define ULTRA_IO_DRIVER_SUPPORTS_ENHANCED_RCVBUF_CHECKING (0x1ULL << 6)
 
-#pragma pack(push, 1)		/* both GCC and VC now allow this pragma */
 /* Common Channel Header */
 struct channel_header {
 	u64 signature;		/* Signature */
@@ -192,7 +191,7 @@ struct channel_header {
 	u8 filler[1];		/* Pad out to 128 byte cacheline */
 	/* Please add all new single-byte values below here */
 	u8 recover_channel;
-};
+} __packed;
 
 #define ULTRA_CHANNEL_ENABLE_INTS (0x1ULL << 0)
 
@@ -230,9 +229,8 @@ struct signal_queue_header {
 				 * to denote trouble with client's
 				 * fields */
 	u8 filler[12];		/* Pad out to 64 byte cacheline */
-};
+} __packed;
 
-#pragma pack(pop)
 
 #define spar_signal_init(chan, QHDRFLD, QDATAFLD, QDATATYPE, ver, typ)	\
 	do {								\
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 2/9] staging: unisys: channel.h Fix spacing around operands.
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
  2015-10-12 19:19 ` [PATCH 1/9] staging: unisys: channel.h covert from pragma to __packed Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 3/9] staging: unisys: visorchannel.c fix spacing around cast Benjamin Romer
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Clean up the seven checks reported by checkpatch.pl --strict.

CHECK: spaces preferred around that '<<' (ctx:VxV)
+#define SIGNATURE_16(A, B) ((A) | (B<<8))
                                   ^
CHECK: spaces preferred around that '+' (ctx:VxV)
+#define COVERQ(v, d)  (((v)+(d)-1) / (d))
                            ^
CHECK: spaces preferred around that '-' (ctx:VxV)
+#define COVERQ(v, d)  (((v)+(d)-1) / (d))
                                ^
CHECK: spaces preferred around that '*' (ctx:VxV)
+#define COVER(v, d)   ((d)*COVERQ(v, d))
                           ^
CHECK: spaces preferred around that '-' (ctx:VxE)
+               chan->QHDRFLD.sig_base_offset = (u64)(chan->QDATAFLD)-  \
                                                                     ^
CHECK: spaces preferred around that '/' (ctx:VxV)
+                       sizeof(chan->QDATAFLD)/sizeof(QDATATYPE);       \
                                              ^
CHECK: spaces preferred around that '-' (ctx:VxV)
+               chan->QHDRFLD.max_signals = chan->QHDRFLD.max_slots-1;  \

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/channel.h | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/drivers/staging/unisys/include/channel.h b/drivers/staging/unisys/include/channel.h
index 698adeb..c6c2442 100644
--- a/drivers/staging/unisys/include/channel.h
+++ b/drivers/staging/unisys/include/channel.h
@@ -32,7 +32,7 @@
  */
 #define __SUPERVISOR_CHANNEL_H__
 
-#define SIGNATURE_16(A, B) ((A) | (B<<8))
+#define SIGNATURE_16(A, B) ((A) | (B << 8))
 #define SIGNATURE_32(A, B, C, D) \
 	(SIGNATURE_16(A, B) | (SIGNATURE_16(C, D) << 16))
 #define SIGNATURE_64(A, B, C, D, E, F, G, H) \
@@ -42,10 +42,10 @@
 #define lengthof(TYPE, MEMBER) (sizeof(((TYPE *)0)->MEMBER))
 #endif
 #ifndef COVERQ
-#define COVERQ(v, d)  (((v)+(d)-1) / (d))
+#define COVERQ(v, d)  (((v) + (d) - 1) / (d))
 #endif
 #ifndef COVER
-#define COVER(v, d)   ((d)*COVERQ(v, d))
+#define COVER(v, d)   ((d) * COVERQ(v, d))
 #endif
 
 #define ULTRA_CHANNEL_PROTOCOL_SIGNATURE  SIGNATURE_32('E', 'C', 'N', 'L')
@@ -231,7 +231,6 @@ struct signal_queue_header {
 	u8 filler[12];		/* Pad out to 64 byte cacheline */
 } __packed;
 
-
 #define spar_signal_init(chan, QHDRFLD, QDATAFLD, QDATATYPE, ver, typ)	\
 	do {								\
 		memset(&chan->QHDRFLD, 0, sizeof(chan->QHDRFLD));	\
@@ -239,11 +238,11 @@ struct signal_queue_header {
 		chan->QHDRFLD.chtype = typ;				\
 		chan->QHDRFLD.size = sizeof(chan->QDATAFLD);		\
 		chan->QHDRFLD.signal_size = sizeof(QDATATYPE);		\
-		chan->QHDRFLD.sig_base_offset = (u64)(chan->QDATAFLD)-	\
+		chan->QHDRFLD.sig_base_offset = (u64)(chan->QDATAFLD) -	\
 			(u64)(&chan->QHDRFLD);				\
 		chan->QHDRFLD.max_slots =				\
-			sizeof(chan->QDATAFLD)/sizeof(QDATATYPE);	\
-		chan->QHDRFLD.max_signals = chan->QHDRFLD.max_slots-1;	\
+			sizeof(chan->QDATAFLD) / sizeof(QDATATYPE);	\
+		chan->QHDRFLD.max_signals = chan->QHDRFLD.max_slots - 1;\
 	} while (0)
 
 /* Generic function useful for validating any type of channel when it is
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 3/9] staging: unisys: visorchannel.c fix spacing around cast
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
  2015-10-12 19:19 ` [PATCH 1/9] staging: unisys: channel.h covert from pragma to __packed Benjamin Romer
  2015-10-12 19:19 ` [PATCH 2/9] staging: unisys: channel.h Fix spacing around operands Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 4/9] staging: unisys: visorchannel.c remove unneeded parenthesis Benjamin Romer
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Clean up the following checkpatch.pl --strict checks:

CHECK: No space is necessary after a cast
+       buf = (u8 *) __get_free_page(GFP_KERNEL);

CHECK: No space is necessary after a cast
+       free_page((unsigned long) buf);

CHECK: spaces preferred around that '+' (ctx:VxE)
+                           SIG_QUEUE_OFFSET(&channel->chan_hdr, queue)+
\
                                                                       ^

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorbus/visorchannel.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index 2693c46..0b6a210 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -279,7 +279,7 @@ visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch,
 	int written = 0;
 	u8 *buf;
 
-	buf = (u8 *) __get_free_page(GFP_KERNEL);
+	buf = (u8 *)__get_free_page(GFP_KERNEL);
 	if (!buf)
 		return -ENOMEM;
 
@@ -301,7 +301,7 @@ visorchannel_clear(struct visorchannel *channel, ulong offset, u8 ch,
 	err = 0;
 
 cleanup:
-	free_page((unsigned long) buf);
+	free_page((unsigned long)buf);
 	return err;
 }
 EXPORT_SYMBOL_GPL(visorchannel_clear);
@@ -332,7 +332,7 @@ EXPORT_SYMBOL_GPL(visorchannel_get_header);
  */
 #define SIG_WRITE_FIELD(channel, queue, sig_hdr, FIELD)			 \
 	(visorchannel_write(channel,					 \
-			    SIG_QUEUE_OFFSET(&channel->chan_hdr, queue)+ \
+			    SIG_QUEUE_OFFSET(&channel->chan_hdr, queue) +\
 			    offsetof(struct signal_queue_header, FIELD), \
 			    &((sig_hdr)->FIELD),			 \
 			    sizeof((sig_hdr)->FIELD)) >= 0)
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 4/9] staging: unisys: visorchannel.c remove unneeded parenthesis
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
                   ` (2 preceding siblings ...)
  2015-10-12 19:19 ` [PATCH 3/9] staging: unisys: visorchannel.c fix spacing around cast Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 5/9] staging: unisys: periodic_work.h Fix parenthesis alignment Benjamin Romer
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Fix the checkpatch.pl -strict check:

CHECK: Unnecessary parentheses around sig_hdr.num_overflows
+                                  &(sig_hdr.num_overflows),

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorbus/visorchannel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/unisys/visorbus/visorchannel.c b/drivers/staging/unisys/visorbus/visorchannel.c
index 0b6a210..a4e117f 100644
--- a/drivers/staging/unisys/visorbus/visorchannel.c
+++ b/drivers/staging/unisys/visorbus/visorchannel.c
@@ -468,7 +468,7 @@ signalinsert_inner(struct visorchannel *channel, u32 queue, void *msg)
 				   SIG_QUEUE_OFFSET(&channel->chan_hdr, queue) +
 				   offsetof(struct signal_queue_header,
 					    num_overflows),
-				   &(sig_hdr.num_overflows),
+				   &sig_hdr.num_overflows,
 				   sizeof(sig_hdr.num_overflows));
 		return false;
 	}
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 5/9] staging: unisys: periodic_work.h Fix parenthesis alignment
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
                   ` (3 preceding siblings ...)
  2015-10-12 19:19 ` [PATCH 4/9] staging: unisys: visorchannel.c remove unneeded parenthesis Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 6/9] staging: unisys: periodic_work.h Fix spacing Benjamin Romer
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Cleanup the checkpatch.pl check alignment should match open parenthesis, in
visor_periodic_work_create().

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/periodic_work.h | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/unisys/include/periodic_work.h b/drivers/staging/unisys/include/periodic_work.h
index 4e19c28..d42b2d0 100644
--- a/drivers/staging/unisys/include/periodic_work.h
+++ b/drivers/staging/unisys/include/periodic_work.h
@@ -27,11 +27,12 @@
  */
 struct periodic_work;
 
-struct periodic_work *visor_periodic_work_create(ulong jiffy_interval,
-					struct workqueue_struct *workqueue,
-					void (*workfunc)(void *),
-					void *workfuncarg,
-					const char *devnam);
+struct periodic_work *
+visor_periodic_work_create(ulong jiffy_interval,
+			   struct workqueue_struct *workqueue,
+			   void (*workfunc)(void *),
+			   void *workfuncarg,
+			   const char *devnam);
 void visor_periodic_work_destroy(struct periodic_work *pw);
 bool visor_periodic_work_nextperiod(struct periodic_work *pw);
 bool visor_periodic_work_start(struct periodic_work *pw);
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 6/9] staging: unisys: periodic_work.h Fix spacing
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
                   ` (4 preceding siblings ...)
  2015-10-12 19:19 ` [PATCH 5/9] staging: unisys: periodic_work.h Fix parenthesis alignment Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 7/9] staging: unisys: diagchannel.h: get rid of unused fields Benjamin Romer
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Cleanup the multiple blank lines check in periodic_work.h.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/periodic_work.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/unisys/include/periodic_work.h b/drivers/staging/unisys/include/periodic_work.h
index d42b2d0..0b3335a 100644
--- a/drivers/staging/unisys/include/periodic_work.h
+++ b/drivers/staging/unisys/include/periodic_work.h
@@ -21,7 +21,6 @@
 #include <linux/seq_file.h>
 #include <linux/slab.h>
 
-
 /* PERIODIC_WORK an opaque structure to users.
  * Fields are declared only in the implementation .c files.
  */
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 7/9] staging: unisys: diagchannel.h: get rid of unused fields
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
                   ` (5 preceding siblings ...)
  2015-10-12 19:19 ` [PATCH 6/9] staging: unisys: periodic_work.h Fix spacing Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 8/9] staging: unisys: vmcallinterface.h: Cleanup " Benjamin Romer
  2015-10-12 19:19 ` [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed Benjamin Romer
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Some more churn of the drivers have made more fields unused, get
rid of them.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/include/diagchannel.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/drivers/staging/unisys/include/diagchannel.h b/drivers/staging/unisys/include/diagchannel.h
index d2d3568..6e813c7 100644
--- a/drivers/staging/unisys/include/diagchannel.h
+++ b/drivers/staging/unisys/include/diagchannel.h
@@ -16,11 +16,6 @@
 #ifndef _DIAG_CHANNEL_H_
 #define _DIAG_CHANNEL_H_
 
-#define MAX_MODULE_NAME_SIZE 128	/* Maximum length of module name... */
-#define MAX_ADDITIONAL_INFO_SIZE 256	/* Maximum length of any additional
-					 * info accompanying event...
-					 */
-
 /* Levels of severity for diagnostic events, in order from lowest severity to
  * highest (i.e. fatal errors are the most severe, and should always be logged,
  * but info events rarely need to be logged except during debugging). The
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 8/9] staging: unisys: vmcallinterface.h: Cleanup unused fields
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
                   ` (6 preceding siblings ...)
  2015-10-12 19:19 ` [PATCH 7/9] staging: unisys: diagchannel.h: get rid of unused fields Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-12 19:19 ` [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed Benjamin Romer
  8 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

With the simplified driver models we have more vmcalls that aren't
supported by linux guests.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorbus/vmcallinterface.h | 46 -----------------------
 1 file changed, 46 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index 7abd27a..7a18aa8 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -46,21 +46,13 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
 
 	VMCALL_IO_CONTROLVM_ADDR = 0x0501,	/* used by all Guests, not just
 						 * IO */
-	VMCALL_IO_DIAG_ADDR = 0x0508,
-	VMCALL_IO_VISORSERIAL_ADDR = 0x0509,
 	VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET = 0x0708, /* Allow caller to
 							  * query virtual time
 							  * offset */
-	VMCALL_CHANNEL_VERSION_MISMATCH = 0x0709,
 	VMCALL_POST_CODE_LOGEVENT = 0x070B,	/* LOGEVENT Post Code (RDX) with
 						 * specified subsystem mask (RCX
 						 * - monitor_subsystems.h) and
 						 * severity (RDX) */
-	VMCALL_GENERIC_SURRENDER_QUANTUM_FOREVER = 0x0802, /* Yield the
-							    * remainder & all
-							    * future quantums of
-							    * the caller */
-	VMCALL_MEASUREMENT_DO_NOTHING = 0x0901,
 	VMCALL_UPDATE_PHYSICAL_TIME = 0x0a02	/* Allow
 						 * ULTRA_SERVICE_CAPABILITY_TIME
 						 * capable guest to make
@@ -107,42 +99,4 @@ struct vmcall_io_controlvm_addr_params {
 #pragma pack(pop)
 /* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
-/* Parameters to VMCALL_IO_DIAG_ADDR interface */
-struct vmcall_io_diag_addr_params {
-	    /* The Guest-relative physical address of the diagnostic channel.
-	    * This VMCall fills this in with the appropriate address. */
-	u64 address;	/* contents provided by this VMCALL (OUT) */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
-
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
-/* Parameters to VMCALL_IO_VISORSERIAL_ADDR interface */
-struct vmcall_io_visorserial_addr_params {
-	    /* The Guest-relative physical address of the serial console
-	    * channel.  This VMCall fills this in with the appropriate
-	    * address. */
-	u64 address;	/* contents provided by this VMCALL (OUT) */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
-
-/* Parameters to VMCALL_CHANNEL_MISMATCH interface */
-struct vmcall_channel_version_mismatch_params {
-	u8 chname[32];	/* Null terminated string giving name of channel
-				 * (IN) */
-	u8 item_name[32];	/* Null terminated string giving name of
-				 * mismatched item (IN) */
-	u32 line_no;		/* line# where invoked. (IN) */
-	u8 file_name[36];	/* source code where invoked - Null terminated
-				 * string (IN) */
-};
-
 #endif /* __IOMONINTF_H__ */
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed
  2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
                   ` (7 preceding siblings ...)
  2015-10-12 19:19 ` [PATCH 8/9] staging: unisys: vmcallinterface.h: Cleanup " Benjamin Romer
@ 2015-10-12 19:19 ` Benjamin Romer
  2015-10-13  3:51   ` Greg KH
  8 siblings, 1 reply; 13+ messages in thread
From: Benjamin Romer @ 2015-10-12 19:19 UTC (permalink / raw)
  To: gregkh; +Cc: sparmaintainer, driverdev-devel, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Convert from pragma to __packed

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
---
 drivers/staging/unisys/visorbus/vmcallinterface.h | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index 7a18aa8..276b784 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -84,7 +84,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
 
 /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
 /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
 /* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */
 struct vmcall_io_controlvm_addr_params {
 	    /* The Guest-relative physical address of the ControlVm channel.
@@ -94,9 +93,8 @@ struct vmcall_io_controlvm_addr_params {
 	    * in with the appropriate address. */
 	u32 channel_bytes;	/* contents provided by this VMCALL (OUT) */
 	u8 unused[4];		/* Unused Bytes in the 64-Bit Aligned Struct */
-};
+} __packed;
 
-#pragma pack(pop)
 /* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
 
 #endif /* __IOMONINTF_H__ */
-- 
2.1.4

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed
  2015-10-12 19:19 ` [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed Benjamin Romer
@ 2015-10-13  3:51   ` Greg KH
  2015-10-13 15:02     ` Ben Romer
  0 siblings, 1 reply; 13+ messages in thread
From: Greg KH @ 2015-10-13  3:51 UTC (permalink / raw)
  To: Benjamin Romer; +Cc: driverdev-devel, sparmaintainer

On Mon, Oct 12, 2015 at 03:19:47PM -0400, Benjamin Romer wrote:
> From: David Kershner <david.kershner@unisys.com>
> 
> Convert from pragma to __packed
> 
> Signed-off-by: David Kershner <david.kershner@unisys.com>
> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
> ---
>  drivers/staging/unisys/visorbus/vmcallinterface.h | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
> index 7a18aa8..276b784 100644
> --- a/drivers/staging/unisys/visorbus/vmcallinterface.h
> +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
> @@ -84,7 +84,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
>  
>  /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
>  /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
> -#pragma pack(push, 1)

You didn't delete the comment lines here, why not?

_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed
  2015-10-13  3:51   ` Greg KH
@ 2015-10-13 15:02     ` Ben Romer
  2015-10-13 15:37       ` [PATCH 9/9 v2] " Benjamin Romer
  0 siblings, 1 reply; 13+ messages in thread
From: Ben Romer @ 2015-10-13 15:02 UTC (permalink / raw)
  To: Greg KH; +Cc: sparmaintainer, driverdev-devel

On 10/12/2015 11:51 PM, Greg KH wrote:
> On Mon, Oct 12, 2015 at 03:19:47PM -0400, Benjamin Romer wrote:
>> From: David Kershner <david.kershner@unisys.com>
>>
>> Convert from pragma to __packed
>>
>> Signed-off-by: David Kershner <david.kershner@unisys.com>
>> Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
>> ---
>>   drivers/staging/unisys/visorbus/vmcallinterface.h | 4 +---
>>   1 file changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
>> index 7a18aa8..276b784 100644
>> --- a/drivers/staging/unisys/visorbus/vmcallinterface.h
>> +++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
>> @@ -84,7 +84,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
>>
>>   /* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
>>   /* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
>> -#pragma pack(push, 1)
>
> You didn't delete the comment lines here, why not?
>

Sorry, we'll fix this and send a v2. :(

-- Ben

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [PATCH 9/9 v2] staging: unisys: vmcallinterface.h: convert pragma to __packed
  2015-10-13 15:02     ` Ben Romer
@ 2015-10-13 15:37       ` Benjamin Romer
  0 siblings, 0 replies; 13+ messages in thread
From: Benjamin Romer @ 2015-10-13 15:37 UTC (permalink / raw)
  To: gregkh; +Cc: driverdev-devel, sparmaintainer, David Kershner, Benjamin Romer

From: David Kershner <david.kershner@unisys.com>

Convert from pragma to __packed

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>

---
v2: remove comments about pragma as well
---
 drivers/staging/unisys/visorbus/vmcallinterface.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index 7a18aa8..c8d8483 100644
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -82,9 +82,6 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
 
 /* Structures for IO VMCALLs */
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
 /* Parameters to VMCALL_IO_CONTROLVM_ADDR interface */
 struct vmcall_io_controlvm_addr_params {
 	    /* The Guest-relative physical address of the ControlVm channel.
@@ -94,9 +91,6 @@ struct vmcall_io_controlvm_addr_params {
 	    * in with the appropriate address. */
 	u32 channel_bytes;	/* contents provided by this VMCALL (OUT) */
 	u8 unused[4];		/* Unused Bytes in the 64-Bit Aligned Struct */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
+} __packed;
 
 #endif /* __IOMONINTF_H__ */
-- 
2.1.4

^ permalink raw reply related	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2015-10-13 15:37 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-12 19:19 [PATCH 0/9] staging: unisys: visorbus cleanup series Benjamin Romer
2015-10-12 19:19 ` [PATCH 1/9] staging: unisys: channel.h covert from pragma to __packed Benjamin Romer
2015-10-12 19:19 ` [PATCH 2/9] staging: unisys: channel.h Fix spacing around operands Benjamin Romer
2015-10-12 19:19 ` [PATCH 3/9] staging: unisys: visorchannel.c fix spacing around cast Benjamin Romer
2015-10-12 19:19 ` [PATCH 4/9] staging: unisys: visorchannel.c remove unneeded parenthesis Benjamin Romer
2015-10-12 19:19 ` [PATCH 5/9] staging: unisys: periodic_work.h Fix parenthesis alignment Benjamin Romer
2015-10-12 19:19 ` [PATCH 6/9] staging: unisys: periodic_work.h Fix spacing Benjamin Romer
2015-10-12 19:19 ` [PATCH 7/9] staging: unisys: diagchannel.h: get rid of unused fields Benjamin Romer
2015-10-12 19:19 ` [PATCH 8/9] staging: unisys: vmcallinterface.h: Cleanup " Benjamin Romer
2015-10-12 19:19 ` [PATCH 9/9] staging: unisys: vmcallinterface.h: convert pragma to __packed Benjamin Romer
2015-10-13  3:51   ` Greg KH
2015-10-13 15:02     ` Ben Romer
2015-10-13 15:37       ` [PATCH 9/9 v2] " Benjamin Romer

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.