LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH]fdomain.c: get rid of unused stuff
@ 2007-03-25 16:11 Parag Warudkar
  2007-03-25 22:32 ` Andrew Morton
  0 siblings, 1 reply; 2+ messages in thread
From: Parag Warudkar @ 2007-03-25 16:11 UTC (permalink / raw)
  To: linux-kernel; +Cc: akpm, torvalds

fdomain.c uses the below stuff only if PCMCIA is not defined.
This causes unused variables to be defined when PCMCIA is not defined. 
Wrap variables and functions around #ifndef PCMCIA appropriately to avoid 
this.

4 less compiler warnings.

Compile tested on i386.

Signed-off-by: Parag Warudkar <parag.warudkar@gmail.com>

--- linux-2.6/drivers/scsi/fdomain.c	2007-03-24 21:44:17.000000000 -0400
+++ linux-2.6-wk/drivers/scsi/fdomain.c	2007-03-25 11:45:26.000000000 -0400
@@ -410,6 +410,7 @@
  static char * fdomain = NULL;
  module_param(fdomain, charp, 0);

+#ifndef PCMCIA
  static unsigned long addresses[] = {
     0xc8000,
     0xca000,
@@ -502,6 +503,7 @@
  };

  #define SIGNATURE_COUNT ARRAY_SIZE(signatures)
+#endif /* ifndef PCMCIA */

  static void print_banner( struct Scsi_Host *shpnt )
  {
@@ -646,7 +648,7 @@
     Sometimes it is possible to use the computer's BIOS setup screen to
     configure a PCI system so that one of these IRQs will be used by the
     Future Domain card. */
-
+#ifndef PCMCIA
  static int fdomain_get_irq( int base )
  {
     int options = inb(base + Configuration1);
@@ -664,6 +666,7 @@
     	return 0;
     return ints[(options & 0x0e) >> 1];
  }
+#endif

  static int fdomain_isa_detect( int *irq, int *iobase )
  {

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

* Re: [PATCH]fdomain.c: get rid of unused stuff
  2007-03-25 16:11 [PATCH]fdomain.c: get rid of unused stuff Parag Warudkar
@ 2007-03-25 22:32 ` Andrew Morton
  0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2007-03-25 22:32 UTC (permalink / raw)
  To: parag.warudkar; +Cc: linux-kernel, torvalds

On Sun, 25 Mar 2007 12:11:23 -0400 (EDT) Parag Warudkar <parag.warudkar@gmail.com> wrote:

> fdomain.c uses the below stuff only if PCMCIA is not defined.
> This causes unused variables to be defined when PCMCIA is not defined. 
> Wrap variables and functions around #ifndef PCMCIA appropriately to avoid 
> this.

Your email client performs space-stuffing and hence mangles patches.

> 4 less compiler warnings.

Please quote the warnings in the changelog when removing them.


> Compile tested on i386.
> 

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

end of thread, other threads:[~2007-03-25 22:32 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-03-25 16:11 [PATCH]fdomain.c: get rid of unused stuff Parag Warudkar
2007-03-25 22:32 ` Andrew Morton

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).