Commit 3d28867a authored by Andrew Morton's avatar Andrew Morton Committed by Greg Kroah-Hartman

[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
parent 7a3e7a62
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
static struct pci_dev *triflex_dev; static struct pci_dev *triflex_dev;
#ifdef CONFIG_PROC_FS
static int triflex_get_info(char *buf, char **addr, off_t offset, int count) static int triflex_get_info(char *buf, char **addr, off_t offset, int count)
{ {
char *p = buf; char *p = buf;
...@@ -91,6 +92,7 @@ static int triflex_get_info(char *buf, char **addr, off_t offset, int count) ...@@ -91,6 +92,7 @@ static int triflex_get_info(char *buf, char **addr, off_t offset, int count)
return len > count ? count : len; return len > count ? count : len;
} }
#endif
static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed) static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
{ {
......
...@@ -14,8 +14,16 @@ ...@@ -14,8 +14,16 @@
static unsigned int __devinit init_chipset_triflex(struct pci_dev *, const char *); static unsigned int __devinit init_chipset_triflex(struct pci_dev *, const char *);
static void init_hwif_triflex(ide_hwif_t *); static void init_hwif_triflex(ide_hwif_t *);
#ifdef CONFIG_PROC_FS
static int triflex_get_info(char *, char **, off_t, int); 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 = { static ide_pci_device_t triflex_devices[] __devinitdata = {
{ {
.vendor = PCI_VENDOR_ID_COMPAQ, .vendor = PCI_VENDOR_ID_COMPAQ,
...@@ -33,14 +41,6 @@ static ide_pci_device_t triflex_devices[] __devinitdata = { ...@@ -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[] = { static struct pci_device_id triflex_pci_tbl[] = {
{ PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE, PCI_ANY_ID, { PCI_VENDOR_ID_COMPAQ, PCI_DEVICE_ID_COMPAQ_TRIFLEX_IDE, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0 }, PCI_ANY_ID, 0, 0, 0 },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment