From: Adrian Bunk <bunk@stusta.de>
The patch below makes several functions in cdrom.c static.
This includes cdrom_is_mrw and cdrom_is_random_writable which were
EXPORT_SYMBOL'ed but weren't used anywhere outside of cdrom.h .
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
25-akpm/drivers/cdrom/cdrom.c | 24 +++++++++++-------------
25-akpm/include/linux/cdrom.h | 2 --
2 files changed, 11 insertions(+), 15 deletions(-)
diff -puN drivers/cdrom/cdrom.c~cdromc-make-several-functions-static drivers/cdrom/cdrom.c
--- 25/drivers/cdrom/cdrom.c~cdromc-make-several-functions-static 2004-11-21 16:09:00.582298592 -0800
+++ 25-akpm/drivers/cdrom/cdrom.c 2004-11-21 16:09:00.592297072 -0800
@@ -505,7 +505,7 @@ int cdrom_get_media_event(struct cdrom_d
* the first prototypes used 0x2c as the page code for the mrw mode page,
* subsequently this was changed to 0x03. probe the one used by this drive
*/
-int cdrom_mrw_probe_pc(struct cdrom_device_info *cdi)
+static int cdrom_mrw_probe_pc(struct cdrom_device_info *cdi)
{
struct packet_command cgc;
char buffer[16];
@@ -526,7 +526,7 @@ int cdrom_mrw_probe_pc(struct cdrom_devi
return 1;
}
-int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write)
+static int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write)
{
struct packet_command cgc;
struct mrw_feature_desc *mfd;
@@ -680,7 +680,7 @@ static int cdrom_mrw_set_lba_space(struc
return 0;
}
-int cdrom_get_random_writable(struct cdrom_device_info *cdi,
+static int cdrom_get_random_writable(struct cdrom_device_info *cdi,
struct rwrt_feature_desc *rfd)
{
struct packet_command cgc;
@@ -701,7 +701,7 @@ int cdrom_get_random_writable(struct cdr
return 0;
}
-int cdrom_has_defect_mgt(struct cdrom_device_info *cdi)
+static int cdrom_has_defect_mgt(struct cdrom_device_info *cdi)
{
struct packet_command cgc;
char buffer[16];
@@ -726,7 +726,7 @@ int cdrom_has_defect_mgt(struct cdrom_de
}
-int cdrom_is_random_writable(struct cdrom_device_info *cdi, int *write)
+static int cdrom_is_random_writable(struct cdrom_device_info *cdi, int *write)
{
struct rwrt_feature_desc rfd;
int ret;
@@ -3074,14 +3074,12 @@ EXPORT_SYMBOL(cdrom_mode_select);
EXPORT_SYMBOL(cdrom_mode_sense);
EXPORT_SYMBOL(init_cdrom_command);
EXPORT_SYMBOL(cdrom_get_media_event);
-EXPORT_SYMBOL(cdrom_is_mrw);
-EXPORT_SYMBOL(cdrom_is_random_writable);
#ifdef CONFIG_SYSCTL
#define CDROM_STR_SIZE 1000
-struct cdrom_sysctl_settings {
+static struct cdrom_sysctl_settings {
char info[CDROM_STR_SIZE]; /* general info */
int autoclose; /* close tray upon mount, etc */
int autoeject; /* eject on umount */
@@ -3090,7 +3088,7 @@ struct cdrom_sysctl_settings {
int check; /* check media type */
} cdrom_sysctl_settings;
-int cdrom_sysctl_info(ctl_table *ctl, int write, struct file * filp,
+static int cdrom_sysctl_info(ctl_table *ctl, int write, struct file * filp,
void __user *buffer, size_t *lenp, loff_t *ppos)
{
int pos;
@@ -3193,7 +3191,7 @@ int cdrom_sysctl_info(ctl_table *ctl, in
procfs/sysctl yet. When they are, this will naturally disappear. For now
just update all drives. Later this will become the template on which
new registered drives will be based. */
-void cdrom_update_settings(void)
+static void cdrom_update_settings(void)
{
struct cdrom_device_info *cdi;
@@ -3271,7 +3269,7 @@ static int cdrom_sysctl_handler(ctl_tabl
}
/* Place files in /proc/sys/dev/cdrom */
-ctl_table cdrom_table[] = {
+static ctl_table cdrom_table[] = {
{
.ctl_name = DEV_CDROM_INFO,
.procname = "info",
@@ -3323,7 +3321,7 @@ ctl_table cdrom_table[] = {
{ .ctl_name = 0 }
};
-ctl_table cdrom_cdrom_table[] = {
+static ctl_table cdrom_cdrom_table[] = {
{
.ctl_name = DEV_CDROM,
.procname = "cdrom",
@@ -3335,7 +3333,7 @@ ctl_table cdrom_cdrom_table[] = {
};
/* Make sure that /proc/sys/dev is there */
-ctl_table cdrom_root_table[] = {
+static ctl_table cdrom_root_table[] = {
{
.ctl_name = CTL_DEV,
.procname = "dev",
diff -puN include/linux/cdrom.h~cdromc-make-several-functions-static include/linux/cdrom.h
--- 25/include/linux/cdrom.h~cdromc-make-several-functions-static 2004-11-21 16:09:00.584298288 -0800
+++ 25-akpm/include/linux/cdrom.h 2004-11-21 16:09:00.589297528 -0800
@@ -1186,8 +1186,6 @@ struct media_event_desc {
};
extern int cdrom_get_media_event(struct cdrom_device_info *cdi, struct media_event_desc *med);
-extern int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write);
-extern int cdrom_is_random_writable(struct cdrom_device_info *cdi, int *write);
#endif /* End of kernel only stuff */
_