Commit 238a1f94 authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds

[PATCH] janitor: fix toshiba for !CONFIG_PROC_FS

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

Fix warning in drivers/char/toshiba.c: `tosh_get_info' defined but not
used
parent 79f4adee
...@@ -84,7 +84,6 @@ static int tosh_fn = 0; ...@@ -84,7 +84,6 @@ static int tosh_fn = 0;
MODULE_PARM(tosh_fn, "i"); MODULE_PARM(tosh_fn, "i");
static int tosh_get_info(char *, char **, off_t, int);
static int tosh_ioctl(struct inode *, struct file *, unsigned int, static int tosh_ioctl(struct inode *, struct file *, unsigned int,
unsigned long); unsigned long);
...@@ -103,6 +102,7 @@ static struct miscdevice tosh_device = { ...@@ -103,6 +102,7 @@ static struct miscdevice tosh_device = {
/* /*
* Read the Fn key status * Read the Fn key status
*/ */
#ifdef CONFIG_PROC_FS
static int tosh_fn_status(void) static int tosh_fn_status(void)
{ {
unsigned char scan; unsigned char scan;
...@@ -119,6 +119,7 @@ static int tosh_fn_status(void) ...@@ -119,6 +119,7 @@ static int tosh_fn_status(void)
return (int) scan; return (int) scan;
} }
#endif
/* /*
...@@ -290,6 +291,7 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd, ...@@ -290,6 +291,7 @@ static int tosh_ioctl(struct inode *ip, struct file *fp, unsigned int cmd,
/* /*
* Print the information for /proc/toshiba * Print the information for /proc/toshiba
*/ */
#ifdef CONFIG_PROC_FS
int tosh_get_info(char *buffer, char **start, off_t fpos, int length) int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
{ {
char *temp; char *temp;
...@@ -318,6 +320,7 @@ int tosh_get_info(char *buffer, char **start, off_t fpos, int length) ...@@ -318,6 +320,7 @@ int tosh_get_info(char *buffer, char **start, off_t fpos, int length)
return temp-buffer; return temp-buffer;
} }
#endif
/* /*
......
...@@ -33,4 +33,13 @@ typedef struct { ...@@ -33,4 +33,13 @@ typedef struct {
unsigned int edi __attribute__ ((packed)); unsigned int edi __attribute__ ((packed));
} SMMRegisters; } SMMRegisters;
#ifdef CONFIG_PROC_FS
static int tosh_get_info(char *, char **, off_t, int);
#else /* !CONFIG_PROC_FS */
inline int tosh_get_info(char *buffer, char **start, off_t fpos, int lenght)
{
return 0;
}
#endif /* CONFIG_PROC_FS */
#endif #endif
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