Skip to contentSkip to conversation

Fix compiler warning.

PATCH In review Robin Holt 3 participants 4 messages Apr 1, 2009 Char and misc drivers

lore
Share & tools
lore

Robin Holt

author
#0 lore raw

PATCH 1/1 Fix compiler warning.

Fix a minor compile warning when building on ia64.

---

 drivers/misc/sgi-xp/xpc_sn2.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/misc/sgi-xp/xpc_sn2.c +5 -5
Index: 20090401-ia64-xpc-no-gru/drivers/misc/sgi-xp/xpc_sn2.c
===================================================================
@@ -1737,20 +1737,20 @@ xpc_clear_remote_msgqueue_flags_sn2(stru
 {
 	struct xpc_channel_sn2 *ch_sn2 = &ch->sn.sn2;
 	struct xpc_msg_sn2 *msg;
-	s64 put;
+	s64 put, remote_nentries = ch->remote_nentries;
 
 	/* flags are zeroed when the buffer is allocated */
-	if (ch_sn2->remote_GP.put < ch->remote_nentries)
+	if (ch_sn2->remote_GP.put < remote_nentries)
 		return;
 
-	put = max(ch_sn2->w_remote_GP.put, ch->remote_nentries);
+	put = max(ch_sn2->w_remote_GP.put, remote_nentries);
 	do {
 		msg = (struct xpc_msg_sn2 *)((u64)ch_sn2->remote_msgqueue +
-					     (put % ch->remote_nentries) *
+					     (put % remote_nentries) *
 					     ch->entry_size);
 		DBUG_ON(!(msg->flags & XPC_M_SN2_READY));
 		DBUG_ON(!(msg->flags & XPC_M_SN2_DONE));
-		DBUG_ON(msg->number != put - ch->remote_nentries);
+		DBUG_ON(msg->number != put - remote_nentries);
 		msg->flags = 0;
 	} while (++put < ch_sn2->remote_GP.put);
 }
#1 lore raw
Quoted 3 lines · Robin Holt

Fix a minor compile warning when building on ia64.

Can you please include the warning in the changelog. And a more descriptive subject would be nice. Something like:

xpc_sn2: fix warning

You usual do so - so I assume this was just an oversight.

Sam

author
#2 lore raw

PATCH 1/1 xpc_sn2: fix max() warning about pointers of different types.

Fix a minor compile warning when building on ia64.

drivers/misc/sgi-xp/xpc_sn2.c: In function ‘xpc_clear_remote_msgqueue_flags_sn2’:
drivers/misc/sgi-xp/xpc_sn2.c:1746: warning: comparison of distinct pointer types lacks a cast

---

 drivers/misc/sgi-xp/xpc_sn2.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/misc/sgi-xp/xpc_sn2.c +5 -5
Index: 20090401-ia64-xpc-no-gru/drivers/misc/sgi-xp/xpc_sn2.c
===================================================================
@@ -1737,20 +1737,20 @@ xpc_clear_remote_msgqueue_flags_sn2(stru
 {
 	struct xpc_channel_sn2 *ch_sn2 = &ch->sn.sn2;
 	struct xpc_msg_sn2 *msg;
-	s64 put;
+	s64 put, remote_nentries = ch->remote_nentries;
 
 	/* flags are zeroed when the buffer is allocated */
-	if (ch_sn2->remote_GP.put < ch->remote_nentries)
+	if (ch_sn2->remote_GP.put < remote_nentries)
 		return;
 
-	put = max(ch_sn2->w_remote_GP.put, ch->remote_nentries);
+	put = max(ch_sn2->w_remote_GP.put, remote_nentries);
 	do {
 		msg = (struct xpc_msg_sn2 *)((u64)ch_sn2->remote_msgqueue +
-					     (put % ch->remote_nentries) *
+					     (put % remote_nentries) *
 					     ch->entry_size);
 		DBUG_ON(!(msg->flags & XPC_M_SN2_READY));
 		DBUG_ON(!(msg->flags & XPC_M_SN2_DONE));
-		DBUG_ON(msg->number != put - ch->remote_nentries);
+		DBUG_ON(msg->number != put - remote_nentries);
 		msg->flags = 0;
 	} while (++put < ch_sn2->remote_GP.put);
 }
#3 lore raw
In reply to Sam Ravnborg
Quoted 6 lines · On Wed, 1 Apr 2009 21:15:37 +0200 Sam Ravnborg <[email protected]> wrote:
Quoted 3 lines · Robin Holt

Fix a minor compile warning when building on ia64.

Can you please include the warning in the changelog.

yup.

Quoted 4 lines

And a more descriptive subject would be nice.
Something like:

xpc_sn2: fix warning

I routinely rewrite titles in that form. Probably about a third of the time.