Re: [PATCH] (2.5.66-mm2) War on warnings

Matthew Dobson (colpatch@us.ibm.com)
Tue, 01 Apr 2003 11:32:28 -0800


This is a MIME-formatted message. If you see this text it means that your
E-mail software does not support MIME-formatted messages.

--=_courier-13437-1049226141-0001-2
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

And whilst we're stomping warnings, here are a couple more I noticed in
various compilations...

-Matt

--=_courier-13437-1049226141-0001-2
Content-Type: text/plain; name="warning_fixes-2.5.66.patch"; charset=iso-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="warning_fixes-2.5.66.patch"

diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.66-vanilla/drivers/char/drm/r128_cce.c linux-2.5.66-warnings/drivers/char/drm/r128_cce.c
--- linux-2.5.66-vanilla/drivers/char/drm/r128_cce.c Mon Mar 24 14:00:07 2003
+++ linux-2.5.66-warnings/drivers/char/drm/r128_cce.c Mon Mar 31 11:55:16 2003
@@ -352,7 +352,7 @@
entry->busaddr[page_ofs]);
DRM_DEBUG( "ring rptr: offset=0x%08x handle=0x%08lx\n",
entry->busaddr[page_ofs],
- entry->handle + tmp_ofs );
+ (unsigned long)entry->handle + tmp_ofs );
}

/* Set watermark control */
diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.66-vanilla/drivers/net/tulip/interrupt.c linux-2.5.66-warnings/drivers/net/tulip/interrupt.c
--- linux-2.5.66-vanilla/drivers/net/tulip/interrupt.c Mon Mar 24 14:00:10 2003
+++ linux-2.5.66-warnings/drivers/net/tulip/interrupt.c Mon Mar 31 11:55:16 2003
@@ -198,7 +198,7 @@
dev->name,
le32_to_cpu(tp->rx_ring[entry].buffer1),
tp->rx_buffers[entry].mapping,
- skb->head, temp);
+ (unsigned long)skb->head, temp);
}
#endif

diff -Nur --exclude-from=/usr/src/.dontdiff linux-2.5.66-vanilla/drivers/scsi/scsi_sysfs.c linux-2.5.66-warnings/drivers/scsi/scsi_sysfs.c
--- linux-2.5.66-vanilla/drivers/scsi/scsi_sysfs.c Mon Mar 24 14:00:08 2003
+++ linux-2.5.66-warnings/drivers/scsi/scsi_sysfs.c Mon Mar 31 11:56:02 2003
@@ -272,14 +272,17 @@
return 0;
}

+void scsi_rescan_device(struct scsi_device *);
static ssize_t
store_rescan_field (struct device *dev, const char *buf, size_t count)
{
int ret = ENODEV;
struct scsi_device *sdev;
sdev = to_scsi_device(dev);
- if (sdev)
- ret = scsi_rescan_device(sdev);
+ if (sdev){
+ ret = 0;
+ scsi_rescan_device(sdev);
+ }
return ret;
}

--=_courier-13437-1049226141-0001-2--