* [PATCH][TRIVIAL] advansys compile fixes
@ 2003-10-13 15:52 Rik van Riel
2003-10-13 16:09 ` Dave Jones
0 siblings, 1 reply; 3+ messages in thread
From: Rik van Riel @ 2003-10-13 15:52 UTC (permalink / raw)
To: Marcelo Tosatti; +Cc: Kernel Mailing List
- initialise req_cnt variable in advansys_detect()
- DvcAdvWritePCIConfigByte() is a void function
diff -urNp linux-5110/drivers/scsi/advansys.c linux-10010/drivers/scsi/advansys.c
--- linux-5110/drivers/scsi/advansys.c
+++ linux-10010/drivers/scsi/advansys.c
@@ -5551,7 +5551,7 @@ advansys_detect(Scsi_Host_Template *tpnt
}
} else {
ADV_CARR_T *carrp;
- int req_cnt;
+ int req_cnt=0;
adv_req_t *reqp = NULL;
int sg_cnt = 0;
@@ -9258,7 +9258,6 @@ DvcAdvWritePCIConfigByte(
ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info)),
offset, byte_data);
#else /* CONFIG_PCI */
- return 0;
#endif /* CONFIG_PCI */
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][TRIVIAL] advansys compile fixes
2003-10-13 15:52 [PATCH][TRIVIAL] advansys compile fixes Rik van Riel
@ 2003-10-13 16:09 ` Dave Jones
2003-10-13 16:15 ` Rik van Riel
0 siblings, 1 reply; 3+ messages in thread
From: Dave Jones @ 2003-10-13 16:09 UTC (permalink / raw)
To: Rik van Riel; +Cc: Marcelo Tosatti, Kernel Mailing List
On Mon, Oct 13, 2003 at 11:52:02AM -0400, Rik van Riel wrote:
> @@ -9258,7 +9258,6 @@ DvcAdvWritePCIConfigByte(
> ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info)),
> offset, byte_data);
> #else /* CONFIG_PCI */
> - return 0;
> #endif /* CONFIG_PCI */
> }
Might as well lose the #else whilst we are at it.
Dave
--
Dave Jones http://www.codemonkey.org.uk
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH][TRIVIAL] advansys compile fixes
2003-10-13 16:09 ` Dave Jones
@ 2003-10-13 16:15 ` Rik van Riel
0 siblings, 0 replies; 3+ messages in thread
From: Rik van Riel @ 2003-10-13 16:15 UTC (permalink / raw)
To: Dave Jones; +Cc: Marcelo Tosatti, Kernel Mailing List
On Mon, 13 Oct 2003, Dave Jones wrote:
> Might as well lose the #else whilst we are at it.
Good point. Fixed patch below.
# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1189 -> 1.1190
# drivers/scsi/advansys.c 1.9 -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/10/13 riel@mirkwood.surriel.com 1.1190
# fix some advansys.c compile warnings
# --------------------------------------------
#
diff -Nru a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
--- a/drivers/scsi/advansys.c Mon Oct 13 12:15:49 2003
+++ b/drivers/scsi/advansys.c Mon Oct 13 12:15:49 2003
@@ -5551,7 +5551,7 @@
}
} else {
ADV_CARR_T *carrp;
- int req_cnt;
+ int req_cnt=0;
adv_req_t *reqp = NULL;
int sg_cnt = 0;
@@ -9257,8 +9257,6 @@
PCI_DEVFN(ASC_PCI_ID2DEV(asc_dvc->cfg->pci_slot_info),
ASC_PCI_ID2FUNC(asc_dvc->cfg->pci_slot_info)),
offset, byte_data);
-#else /* CONFIG_PCI */
- return 0;
#endif /* CONFIG_PCI */
}
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2003-10-13 16:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2003-10-13 15:52 [PATCH][TRIVIAL] advansys compile fixes Rik van Riel
2003-10-13 16:09 ` Dave Jones
2003-10-13 16:15 ` Rik van Riel
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.