lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Char: cyclades, unexport struct cyclades_card

Browse Source 
Do not export internal card data to userspace. cytune doesn't use this
anyway.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jiri Slaby
2007-05-08 00:36:38 -07:00
committed by Linus Torvalds
parent cff9494fad
commit b81cc310f1
2 changed files with 2 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/char/cyclades.c
View File

@@ -4049,14 +4049,6 @@ cy_ioctl(struct tty_struct *tty, struct file *file,
case CYGETRTSDTR_INV: case CYGETRTSDTR_INV:
ret_val = info->rtsdtr_inv; ret_val = info->rtsdtr_inv;
break; break;
case CYGETCARDINFO:
if (copy_to_user(argp, &cy_card[info->card],
sizeof(struct cyclades_card))) {
ret_val = -EFAULT;
break;
}
ret_val = 0;
break;
case CYGETCD1400VER: case CYGETCD1400VER:
ret_val = info->chip_rev; ret_val = info->chip_rev;
break; break;

15
include/linux/cyclades.h
View File

@@ -110,7 +110,6 @@ struct cyclades_idle_stats {
#define CYZSETPOLLCYCLE 0x43590e #define CYZSETPOLLCYCLE 0x43590e
#define CYZGETPOLLCYCLE 0x43590f #define CYZGETPOLLCYCLE 0x43590f
#define CYGETCD1400VER 0x435910 #define CYGETCD1400VER 0x435910
#define CYGETCARDINFO 0x435911
#define CYSETWAIT 0x435912 #define CYSETWAIT 0x435912
#define CYGETWAIT 0x435913 #define CYGETWAIT 0x435913
@@ -506,8 +505,9 @@ struct ZFW_CTRL {
/****************** ****************** *******************/ /****************** ****************** *******************/
#endif #endif
#ifdef __KERNEL__
/* Per card data structure */ /* Per card data structure */
struct resource;
struct cyclades_card { struct cyclades_card {
unsigned long base_phys; unsigned long base_phys;
unsigned long ctl_phys; unsigned long ctl_phys;
@@ -520,20 +520,9 @@ struct cyclades_card {
int bus_index; /* address shift - 0 for ISA, 1 for PCI */ int bus_index; /* address shift - 0 for ISA, 1 for PCI */
int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */ int intr_enabled; /* FW Interrupt flag - 0 disabled, 1 enabled */
struct pci_dev *pdev; struct pci_dev *pdev;
#ifdef __KERNEL__
spinlock_t card_lock; spinlock_t card_lock;
#else
unsigned long filler;
#endif
}; };
struct cyclades_chip {
int filler;
};
#ifdef __KERNEL__
/*************************************** /***************************************
* Memory access functions/macros * * Memory access functions/macros *
* (required to support Alpha systems) * * (required to support Alpha systems) *