[PATCH] janitor: ide/pci/triflex: handle !CONFIG_PROC_FS

From: "Randy.Dunlap" <rddunlap@osdl.org>

From: Luiz Fernando Capitulino <lcapitulino@prefeitura.sp.gov.br>

this patch fixes this warning:

drivers/ide/pci/triflex.c:49: warning: `triflex_get_info' defined but not used

diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index cbb1b6afff41428ccc6045ba04cffa34ff4207a5..50085d879d47babf76e2d6f8826aa1140a266638 100644 (file)
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -45,6 +45,7 @@
 
 static struct pci_dev *triflex_dev;
 
+#ifdef CONFIG_PROC_FS
 static int triflex_get_info(char *buf, char **addr, off_t offset, int count)
 {
        char *p = buf;
@@ -91,6 +92,7 @@ static int triflex_get_info(char *buf, char **addr, off_t offset, int count)
        
        return len > count ? count : len;
 }
+#endif
 
 static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
 {

diff --git a/drivers/ide/pci/triflex.h b/drivers/ide/pci/triflex.h
index 08ac52ddb9d412349302008d1b7a413f095f887d..b208926283ed0998a70e590a53a2c92a72ccc2f3 100644 (file)
--- a/drivers/ide/pci/triflex.h
+++ b/drivers/ide/pci/triflex.h
@@ -14,8 +14,16 @@
 
 static unsigned int __devinit init_chipset_triflex(struct pci_dev *, const char *);
 static void init_hwif_triflex(ide_hwif_t *);
+#ifdef CONFIG_PROC_FS
 static int triflex_get_info(char *, char **, off_t, int);
 
+static ide_pci_host_proc_t triflex_proc __initdata = {
+       .name           = "triflex",
+       .set            = 1,
+       .get_info       = triflex_get_info,
+};
+#endif
+
 static ide_pci_device_t triflex_devices[] __devinitdata = {
        {
                .vendor         = PCI_VENDOR_ID_COMPAQ,
@@ -33,14 +41,6 @@ static ide_pci_device_t triflex_devices[] __devinitdata = {
        }
 };
 
-#ifdef CONFIG_PROC_FS
-static ide_pci_host_proc_t triflex_proc __initdata = {
-       .name           = "triflex",
-       .set            = 1,
-       .get_info       = triflex_get_info,
-};
-#endif
-
 static struct pci_device_id triflex_pci_tbl[] = {
        { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE, PCI_ANY_ID, 
                PCI_ANY_ID, 0, 0, 0 },