Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id ; Mon, 10 Dec 2001 16:23:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id ; Mon, 10 Dec 2001 16:22:41 -0500 Received: from zeus.kernel.org ([204.152.189.113]:51329 "EHLO zeus.kernel.org") by vger.kernel.org with ESMTP id ; Mon, 10 Dec 2001 16:22:37 -0500 Date: Mon, 10 Dec 2001 18:01:03 -0200 (BRST) From: Marcelo Tosatti To: Pavel Roskin Cc: linux-kernel@vger.kernel.org, Alan Cox Subject: Re: [PATCH] 2.4.17-pre7: fdomain_16x0_release undeclared In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The second hunk of the your patch is already on my tree. On Mon, 10 Dec 2001, Pavel Roskin wrote: > Hello, Alan and all! > > File drivers/scsi/fdomain.h declares a data structure FDOMAIN_16X0 using > an undeclared function fdomain_16x0_release() in Linux 2.4.17-pre7. > > This is not a problem for the kernel itself, but it breaks compilation of > pcmcia-cs-3.1.30 because the later uses structure FDOMAIN_16X0. > > The fix is trivial - declare fdomain_16x0_release() the same way as other > non-static functions from fdomain.c. > > Another partly related problem is a warning in fdomain.c: > > fdomain.c: In function `fdomain_16x0_release': > fdomain.c:2045: warning: control reaches end of non-void function > > I wonder if the patches that introduce warnings should be allowed in the > stable branch? Anyway, comparing with other SCSI drivers I see that 0 > should be returned and scsi_unregister(shpnt) should be called before > that. > > Here's the patch. The part for fdomain.h is 100% safe and should be > applied ASAP. The part for fdomain.c should be safe too but I'll > appreciate if somebody tests it on a real Future Domain controller. > > ------------------------------ > --- linux.orig/drivers/scsi/fdomain.c > +++ linux/drivers/scsi/fdomain.c > @@ -2042,6 +2042,8 @@ int fdomain_16x0_release(struct Scsi_Hos > if (shpnt->io_port && shpnt->n_io_port) > release_region(shpnt->io_port, shpnt->n_io_port); > > + scsi_unregister(shpnt); > + return 0; > } > > MODULE_LICENSE("GPL"); > --- linux.orig/drivers/scsi/fdomain.h > +++ linux/drivers/scsi/fdomain.h > @@ -34,6 +34,7 @@ > int fdomain_16x0_biosparam( Disk *, kdev_t, int * ); > int fdomain_16x0_proc_info( char *buffer, char **start, off_t offset, > int length, int hostno, int inout ); > +int fdomain_16x0_release(struct Scsi_Host *shpnt); > > #define FDOMAIN_16X0 { proc_info: fdomain_16x0_proc_info, \ > detect: fdomain_16x0_detect, \ > ------------------------------ > > -- > Regards, > Pavel Roskin > > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ > - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/