Skip to content

L
linux
Commit 68d994ba authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Linus Torvalds
Browse files
Options

[PATCH] ide: remove needless exports 

Remove needless exports from ide.c, ide-probe.c and ide-proc.c.
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7f1d74ad
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 79 deletions
drivers/ide/ide-probe.c
View file @ 68d994ba
...@@ -646,8 +646,6 @@ static void hwif_register (ide_hwif_t *hwif) ...@@ -646,8 +646,6 @@ static void hwif_register (ide_hwif_t *hwif)
device_register(&hwif->gendev); device_register(&hwif->gendev);
} }
//EXPORT_SYMBOL(hwif_register);
#ifdef CONFIG_PPC #ifdef CONFIG_PPC
static int wait_hwif_ready(ide_hwif_t *hwif) static int wait_hwif_ready(ide_hwif_t *hwif)
{ {
...@@ -690,7 +688,7 @@ static int wait_hwif_ready(ide_hwif_t *hwif) ...@@ -690,7 +688,7 @@ static int wait_hwif_ready(ide_hwif_t *hwif)
* This routine only knows how to look for drive units 0 and 1 * This routine only knows how to look for drive units 0 and 1
* on an interface, so any setting of MAX_DRIVES > 2 won't work here. * on an interface, so any setting of MAX_DRIVES > 2 won't work here.
*/ */
void probe_hwif (ide_hwif_t *hwif) static void probe_hwif(ide_hwif_t *hwif)
{ {
unsigned int unit; unsigned int unit;
unsigned long flags; unsigned long flags;
...@@ -834,9 +832,7 @@ void probe_hwif (ide_hwif_t *hwif) ...@@ -834,9 +832,7 @@ void probe_hwif (ide_hwif_t *hwif)
} }
} }
EXPORT_SYMBOL(probe_hwif); static int hwif_init(ide_hwif_t *hwif);
int hwif_init (ide_hwif_t *hwif);
int probe_hwif_init (ide_hwif_t *hwif) int probe_hwif_init (ide_hwif_t *hwif)
{ {
probe_hwif(hwif); probe_hwif(hwif);
...@@ -871,7 +867,7 @@ EXPORT_SYMBOL(probe_hwif_init); ...@@ -871,7 +867,7 @@ EXPORT_SYMBOL(probe_hwif_init);
* *
* This routine detects and reports such situations, but does not fix them. * This routine detects and reports such situations, but does not fix them.
*/ */
void save_match (ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match) static void save_match(ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
{ {
ide_hwif_t *m = *match; ide_hwif_t *m = *match;
...@@ -884,7 +880,6 @@ void save_match (ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match) ...@@ -884,7 +880,6 @@ void save_match (ide_hwif_t *hwif, ide_hwif_t *new, ide_hwif_t **match)
if (!m || m->irq != hwif->irq) /* don't undo a prior perfect match */ if (!m || m->irq != hwif->irq) /* don't undo a prior perfect match */
*match = new; *match = new;
} }
EXPORT_SYMBOL(save_match);
#endif /* MAX_HWIFS > 1 */ #endif /* MAX_HWIFS > 1 */
/* /*
...@@ -1231,9 +1226,7 @@ static void init_gendisk (ide_hwif_t *hwif) ...@@ -1231,9 +1226,7 @@ static void init_gendisk (ide_hwif_t *hwif)
THIS_MODULE, ata_probe, ata_lock, hwif); THIS_MODULE, ata_probe, ata_lock, hwif);
} }
EXPORT_SYMBOL(init_gendisk); static int hwif_init(ide_hwif_t *hwif)
int hwif_init (ide_hwif_t *hwif)
{ {
int old_irq, unit; int old_irq, unit;
...@@ -1301,8 +1294,6 @@ int hwif_init (ide_hwif_t *hwif) ...@@ -1301,8 +1294,6 @@ int hwif_init (ide_hwif_t *hwif)
return 0; return 0;
} }
EXPORT_SYMBOL(hwif_init);
int ideprobe_init (void) int ideprobe_init (void)
{ {
unsigned int index; unsigned int index;
......
drivers/ide/ide-proc.c
View file @ 68d994ba
...@@ -280,7 +280,7 @@ static int proc_ide_write_config(struct file *file, const char __user *buffer, ...@@ -280,7 +280,7 @@ static int proc_ide_write_config(struct file *file, const char __user *buffer,
goto out1; goto out1;
} }
int proc_ide_read_config static int proc_ide_read_config
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
char *out = page; char *out = page;
...@@ -317,8 +317,6 @@ int proc_ide_read_config ...@@ -317,8 +317,6 @@ int proc_ide_read_config
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_config);
static int proc_ide_read_imodel static int proc_ide_read_imodel
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
...@@ -352,9 +350,7 @@ static int proc_ide_read_imodel ...@@ -352,9 +350,7 @@ static int proc_ide_read_imodel
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_imodel); static int proc_ide_read_mate
int proc_ide_read_mate
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_hwif_t *hwif = (ide_hwif_t *) data; ide_hwif_t *hwif = (ide_hwif_t *) data;
...@@ -367,9 +363,7 @@ int proc_ide_read_mate ...@@ -367,9 +363,7 @@ int proc_ide_read_mate
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_mate); static int proc_ide_read_channel
int proc_ide_read_channel
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_hwif_t *hwif = (ide_hwif_t *) data; ide_hwif_t *hwif = (ide_hwif_t *) data;
...@@ -381,9 +375,7 @@ int proc_ide_read_channel ...@@ -381,9 +375,7 @@ int proc_ide_read_channel
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_channel); static int proc_ide_read_identify
int proc_ide_read_identify
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *)data; ide_drive_t *drive = (ide_drive_t *)data;
...@@ -425,9 +417,7 @@ int proc_ide_read_identify ...@@ -425,9 +417,7 @@ int proc_ide_read_identify
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_identify); static int proc_ide_read_settings
int proc_ide_read_settings
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) data;
...@@ -459,12 +449,10 @@ int proc_ide_read_settings ...@@ -459,12 +449,10 @@ int proc_ide_read_settings
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_settings);
#define MAX_LEN 30 #define MAX_LEN 30
int proc_ide_write_settings(struct file *file, const char __user *buffer, static int proc_ide_write_settings(struct file *file, const char __user *buffer,
unsigned long count, void *data) unsigned long count, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) data;
char name[MAX_LEN + 1]; char name[MAX_LEN + 1];
...@@ -555,8 +543,6 @@ int proc_ide_write_settings(struct file *file, const char __user *buffer, ...@@ -555,8 +543,6 @@ int proc_ide_write_settings(struct file *file, const char __user *buffer,
return -EINVAL; return -EINVAL;
} }
EXPORT_SYMBOL(proc_ide_write_settings);
int proc_ide_read_capacity int proc_ide_read_capacity
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
...@@ -568,8 +554,6 @@ int proc_ide_read_capacity ...@@ -568,8 +554,6 @@ int proc_ide_read_capacity
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_capacity);
int proc_ide_read_geometry int proc_ide_read_geometry
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
...@@ -588,7 +572,7 @@ int proc_ide_read_geometry ...@@ -588,7 +572,7 @@ int proc_ide_read_geometry
EXPORT_SYMBOL(proc_ide_read_geometry); EXPORT_SYMBOL(proc_ide_read_geometry);
int proc_ide_read_dmodel static int proc_ide_read_dmodel
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) data;
...@@ -600,9 +584,7 @@ int proc_ide_read_dmodel ...@@ -600,9 +584,7 @@ int proc_ide_read_dmodel
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_dmodel); static int proc_ide_read_driver
int proc_ide_read_driver
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) data;
...@@ -614,9 +596,7 @@ int proc_ide_read_driver ...@@ -614,9 +596,7 @@ int proc_ide_read_driver
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_driver); static int proc_ide_write_driver
int proc_ide_write_driver
(struct file *file, const char __user *buffer, unsigned long count, void *data) (struct file *file, const char __user *buffer, unsigned long count, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) data;
...@@ -634,9 +614,7 @@ int proc_ide_write_driver ...@@ -634,9 +614,7 @@ int proc_ide_write_driver
return count; return count;
} }
EXPORT_SYMBOL(proc_ide_write_driver); static int proc_ide_read_media
int proc_ide_read_media
(char *page, char **start, off_t off, int count, int *eof, void *data) (char *page, char **start, off_t off, int count, int *eof, void *data)
{ {
ide_drive_t *drive = (ide_drive_t *) data; ide_drive_t *drive = (ide_drive_t *) data;
...@@ -660,8 +638,6 @@ int proc_ide_read_media ...@@ -660,8 +638,6 @@ int proc_ide_read_media
PROC_IDE_READ_RETURN(page,start,off,count,eof,len); PROC_IDE_READ_RETURN(page,start,off,count,eof,len);
} }
EXPORT_SYMBOL(proc_ide_read_media);
static ide_proc_entry_t generic_drive_entries[] = { static ide_proc_entry_t generic_drive_entries[] = {
{ "driver", S_IFREG|S_IRUGO, proc_ide_read_driver, proc_ide_write_driver }, { "driver", S_IFREG|S_IRUGO, proc_ide_read_driver, proc_ide_write_driver },
{ "identify", S_IFREG|S_IRUSR, proc_ide_read_identify, NULL }, { "identify", S_IFREG|S_IRUSR, proc_ide_read_identify, NULL },
...@@ -688,8 +664,6 @@ void ide_add_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p, void ...@@ -688,8 +664,6 @@ void ide_add_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p, void
} }
} }
EXPORT_SYMBOL(ide_add_proc_entries);
void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p) void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p)
{ {
if (!dir || !p) if (!dir || !p)
...@@ -700,9 +674,7 @@ void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p) ...@@ -700,9 +674,7 @@ void ide_remove_proc_entries(struct proc_dir_entry *dir, ide_proc_entry_t *p)
} }
} }
EXPORT_SYMBOL(ide_remove_proc_entries); static void create_proc_ide_drives(ide_hwif_t *hwif)
void create_proc_ide_drives(ide_hwif_t *hwif)
{ {
int d; int d;
struct proc_dir_entry *ent; struct proc_dir_entry *ent;
...@@ -726,9 +698,7 @@ void create_proc_ide_drives(ide_hwif_t *hwif) ...@@ -726,9 +698,7 @@ void create_proc_ide_drives(ide_hwif_t *hwif)
} }
} }
EXPORT_SYMBOL(create_proc_ide_drives); static void destroy_proc_ide_device(ide_hwif_t *hwif, ide_drive_t *drive)
void destroy_proc_ide_device(ide_hwif_t *hwif, ide_drive_t *drive)
{ {
ide_driver_t *driver = drive->driver; ide_driver_t *driver = drive->driver;
...@@ -741,8 +711,6 @@ void destroy_proc_ide_device(ide_hwif_t *hwif, ide_drive_t *drive) ...@@ -741,8 +711,6 @@ void destroy_proc_ide_device(ide_hwif_t *hwif, ide_drive_t *drive)
} }
} }
EXPORT_SYMBOL(destroy_proc_ide_device);
void destroy_proc_ide_drives(ide_hwif_t *hwif) void destroy_proc_ide_drives(ide_hwif_t *hwif)
{ {
int d; int d;
...@@ -754,8 +722,6 @@ void destroy_proc_ide_drives(ide_hwif_t *hwif) ...@@ -754,8 +722,6 @@ void destroy_proc_ide_drives(ide_hwif_t *hwif)
} }
} }
EXPORT_SYMBOL(destroy_proc_ide_drives);
static ide_proc_entry_t hwif_entries[] = { static ide_proc_entry_t hwif_entries[] = {
{ "channel", S_IFREG|S_IRUGO, proc_ide_read_channel, NULL }, { "channel", S_IFREG|S_IRUGO, proc_ide_read_channel, NULL },
{ "config", S_IFREG|S_IRUGO|S_IWUSR,proc_ide_read_config, proc_ide_write_config }, { "config", S_IFREG|S_IRUGO|S_IWUSR,proc_ide_read_config, proc_ide_write_config },
...@@ -843,13 +809,9 @@ void proc_ide_create(void) ...@@ -843,13 +809,9 @@ void proc_ide_create(void)
entry->proc_fops = &ide_drivers_operations; entry->proc_fops = &ide_drivers_operations;
} }
EXPORT_SYMBOL(proc_ide_create);
void proc_ide_destroy(void) void proc_ide_destroy(void)
{ {
remove_proc_entry("ide/drivers", proc_ide_root); remove_proc_entry("ide/drivers", proc_ide_root);
destroy_proc_ide_interfaces(); destroy_proc_ide_interfaces();
remove_proc_entry("ide", 0); remove_proc_entry("ide", 0);
} }
EXPORT_SYMBOL(proc_ide_destroy);
drivers/ide/ide.c
View file @ 68d994ba
...@@ -188,7 +188,6 @@ int noautodma = 1; ...@@ -188,7 +188,6 @@ int noautodma = 1;
#endif #endif
EXPORT_SYMBOL(noautodma); EXPORT_SYMBOL(noautodma);
EXPORT_SYMBOL(ide_bus_type);
/* /*
* This is declared extern in ide.h, for access by other IDE modules: * This is declared extern in ide.h, for access by other IDE modules:
...@@ -554,8 +553,6 @@ int ide_hwif_request_regions(ide_hwif_t *hwif) ...@@ -554,8 +553,6 @@ int ide_hwif_request_regions(ide_hwif_t *hwif)
return -EBUSY; return -EBUSY;
} }
EXPORT_SYMBOL(ide_hwif_request_regions);
/** /**
* ide_hwif_release_regions - free IDE resources * ide_hwif_release_regions - free IDE resources
* *
...@@ -584,8 +581,6 @@ void ide_hwif_release_regions(ide_hwif_t *hwif) ...@@ -584,8 +581,6 @@ void ide_hwif_release_regions(ide_hwif_t *hwif)
release_region(hwif->io_ports[i], 1); release_region(hwif->io_ports[i], 1);
} }
EXPORT_SYMBOL(ide_hwif_release_regions);
/* restore hwif to a sane state */ /* restore hwif to a sane state */
static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
{ {
...@@ -936,8 +931,6 @@ void ide_setup_ports ( hw_regs_t *hw, ...@@ -936,8 +931,6 @@ void ide_setup_ports ( hw_regs_t *hw,
*/ */
} }
EXPORT_SYMBOL(ide_setup_ports);
/* /*
* Register an IDE interface, specifying exactly the registers etc * Register an IDE interface, specifying exactly the registers etc
* Set init=1 iff calling before probes have taken place. * Set init=1 iff calling before probes have taken place.
...@@ -998,7 +991,6 @@ EXPORT_SYMBOL(ide_register_hw); ...@@ -998,7 +991,6 @@ EXPORT_SYMBOL(ide_register_hw);
*/ */
DECLARE_MUTEX(ide_setting_sem); DECLARE_MUTEX(ide_setting_sem);
EXPORT_SYMBOL(ide_setting_sem);
/** /**
* ide_add_setting - add an ide setting option * ide_add_setting - add an ide setting option
...@@ -1272,8 +1264,6 @@ int ide_write_setting (ide_drive_t *drive, ide_settings_t *setting, int val) ...@@ -1272,8 +1264,6 @@ int ide_write_setting (ide_drive_t *drive, ide_settings_t *setting, int val)
return 0; return 0;
} }
EXPORT_SYMBOL(ide_write_setting);
static int set_io_32bit(ide_drive_t *drive, int arg) static int set_io_32bit(ide_drive_t *drive, int arg)
{ {
drive->io_32bit = arg; drive->io_32bit = arg;
...@@ -1401,8 +1391,6 @@ int ide_replace_subdriver (ide_drive_t *drive, const char *driver) ...@@ -1401,8 +1391,6 @@ int ide_replace_subdriver (ide_drive_t *drive, const char *driver)
return 1; return 1;
} }
EXPORT_SYMBOL(ide_replace_subdriver);
int ata_attach(ide_drive_t *drive) int ata_attach(ide_drive_t *drive)
{ {
struct list_head *p; struct list_head *p;
...@@ -1427,8 +1415,6 @@ int ata_attach(ide_drive_t *drive) ...@@ -1427,8 +1415,6 @@ int ata_attach(ide_drive_t *drive)
return 1; return 1;
} }
EXPORT_SYMBOL(ata_attach);
static int generic_ide_suspend(struct device *dev, u32 state) static int generic_ide_suspend(struct device *dev, u32 state)
{ {
ide_drive_t *drive = dev->driver_data; ide_drive_t *drive = dev->driver_data;
......
include/linux/ide.h
View file @ 68d994ba
...@@ -1116,7 +1116,6 @@ extern struct proc_dir_entry *proc_ide_root; ...@@ -1116,7 +1116,6 @@ extern struct proc_dir_entry *proc_ide_root;
extern void proc_ide_create(void); extern void proc_ide_create(void);
extern void proc_ide_destroy(void); extern void proc_ide_destroy(void);
extern void destroy_proc_ide_device(ide_hwif_t *, ide_drive_t *);
extern void destroy_proc_ide_drives(ide_hwif_t *); extern void destroy_proc_ide_drives(ide_hwif_t *);
extern void create_proc_ide_interfaces(void); extern void create_proc_ide_interfaces(void);
extern void ide_add_proc_entries(struct proc_dir_entry *, ide_proc_entry_t *, void *); extern void ide_add_proc_entries(struct proc_dir_entry *, ide_proc_entry_t *, void *);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7