Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75c96f85 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] make some things static 



This patch makes some needlessly global identifiers static.

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarArjan van de Ven <arjanv@infradead.org>
Acked-by: default avatarTrond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5e198d94

drivers/block/rd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ static struct request_queue *rd_queue[CONFIG_BLK_DEV_RAM_COUNT]; 
 * architecture-specific setup routine (from the stored boot sector

 * architecture-specific setup routine (from the stored boot sector

 * information).

 * information).

 */

 */

int rd_size = CONFIG_BLK_DEV_RAM_SIZE;		/* Size of the RAM disks */

static int rd_size = CONFIG_BLK_DEV_RAM_SIZE;	/* Size of the RAM disks */

/*

/*

 * It would be very desirable to have a soft-blocksize (that in the case

 * It would be very desirable to have a soft-blocksize (that in the case

 * of the ramdisk driver is also the hardblocksize ;) of PAGE_SIZE because

 * of the ramdisk driver is also the hardblocksize ;) of PAGE_SIZE because

drivers/cdrom/cdu31a.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -292,7 +292,7 @@ module_param(cdu31a_irq, int, 0); 




/* The interrupt handler will wake this queue up when it gets an

/* The interrupt handler will wake this queue up when it gets an

   interrupts. */

   interrupts. */

DECLARE_WAIT_QUEUE_HEAD(cdu31a_irq_wait);

static DECLARE_WAIT_QUEUE_HEAD(cdu31a_irq_wait);

static int irq_flag = 0;

static int irq_flag = 0;





static int curr_control_reg = 0;	/* Current value of the control register */

static int curr_control_reg = 0;	/* Current value of the control register */
@@ -2947,7 +2947,7 @@ static int scd_block_media_changed(struct gendisk *disk) 
	return cdrom_media_changed(&scd_info);

	return cdrom_media_changed(&scd_info);

}

}





struct block_device_operations scd_bdops =

static struct block_device_operations scd_bdops =

{

{

	.owner		= THIS_MODULE,

	.owner		= THIS_MODULE,

	.open		= scd_block_open,

	.open		= scd_block_open,
@@ -3216,7 +3216,7 @@ int __init cdu31a_init(void) 
}

}









void __exit cdu31a_exit(void)

static void __exit cdu31a_exit(void)

{

{

	del_gendisk(scd_gendisk);

	del_gendisk(scd_gendisk);

	put_disk(scd_gendisk);

	put_disk(scd_gendisk);

drivers/cdrom/mcdx.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -107,20 +107,20 @@ static const char *mcdx_c_version 
   The _direct_ size is the number of sectors we're allowed to skip

   The _direct_ size is the number of sectors we're allowed to skip

   directly (performing a read instead of requesting the new sector

   directly (performing a read instead of requesting the new sector

   needed */

   needed */

const int REQUEST_SIZE = 800;	/* should be less then 255 * 4 */

static const int REQUEST_SIZE = 800;	/* should be less then 255 * 4 */

const int DIRECT_SIZE = 400;	/* should be less then REQUEST_SIZE */

static const int DIRECT_SIZE = 400;	/* should be less then REQUEST_SIZE */





enum drivemodes { TOC, DATA, RAW, COOKED };

enum drivemodes { TOC, DATA, RAW, COOKED };

enum datamodes { MODE0, MODE1, MODE2 };

enum datamodes { MODE0, MODE1, MODE2 };

enum resetmodes { SOFT, HARD };

enum resetmodes { SOFT, HARD };





const int SINGLE = 0x01;	/* single speed drive (FX001S, LU) */

static const int SINGLE = 0x01;		/* single speed drive (FX001S, LU) */

const int DOUBLE = 0x02;	/* double speed drive (FX001D, ..? */

static const int DOUBLE = 0x02;		/* double speed drive (FX001D, ..? */

const int DOOR = 0x04;		/* door locking capability */

static const int DOOR = 0x04;		/* door locking capability */

const int MULTI = 0x08;		/* multi session capability */

static const int MULTI = 0x08;		/* multi session capability */





const unsigned char READ1X = 0xc0;

static const unsigned char READ1X = 0xc0;

const unsigned char READ2X = 0xc1;

static const unsigned char READ2X = 0xc1;









/* DECLARATIONS ****************************************************/

/* DECLARATIONS ****************************************************/
@@ -210,9 +210,7 @@ struct s_drive_stuff { 
 	repeated here to show what's going on.  And to sense, if they're

 	repeated here to show what's going on.  And to sense, if they're

	changed elsewhere. */

	changed elsewhere. */





/* declared in blk.h */

static int mcdx_init(void);

int mcdx_init(void);

void do_mcdx_request(request_queue_t * q);





static int mcdx_block_open(struct inode *inode, struct file *file)

static int mcdx_block_open(struct inode *inode, struct file *file)

{

{
@@ -569,7 +567,7 @@ static int mcdx_audio_ioctl(struct cdrom_device_info *cdi, 
	}

	}

}

}





void do_mcdx_request(request_queue_t * q)

static void do_mcdx_request(request_queue_t * q)

{

{

	struct s_drive_stuff *stuffp;

	struct s_drive_stuff *stuffp;

	struct request *req;

	struct request *req;
@@ -1028,7 +1026,7 @@ int __mcdx_init(void) 
	return 0;

	return 0;

}

}





void __exit mcdx_exit(void)

static void __exit mcdx_exit(void)

{

{

	int i;

	int i;
@@ -1075,7 +1073,7 @@ module_exit(mcdx_exit); 




/* Support functions ************************************************/

/* Support functions ************************************************/





int __init mcdx_init_drive(int drive)

static int __init mcdx_init_drive(int drive)

{

{

	struct s_version version;

	struct s_version version;

	struct gendisk *disk;

	struct gendisk *disk;
@@ -1261,7 +1259,7 @@ int __init mcdx_init_drive(int drive) 
	return 0;

	return 0;

}

}





int __init mcdx_init(void)

static int __init mcdx_init(void)

{

{

	int drive;

	int drive;

	xwarn("Version 2.14(hs) \n");

	xwarn("Version 2.14(hs) \n");

drivers/cdrom/sbpcd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5895,7 +5895,7 @@ int __init sbpcd_init(void) 
}

}

/*==========================================================================*/

/*==========================================================================*/

#ifdef MODULE

#ifdef MODULE

void sbpcd_exit(void)

static void sbpcd_exit(void)

{

{

	int j;

	int j;

drivers/char/keyboard.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1026,7 +1026,8 @@ static void kbd_rawcode(unsigned char data) 
		put_queue(vc, data);

		put_queue(vc, data);

}

}





void kbd_keycode(unsigned int keycode, int down, int hw_raw, struct pt_regs *regs)

static void kbd_keycode(unsigned int keycode, int down,

			int hw_raw, struct pt_regs *regs)

{

{

	struct vc_data *vc = vc_cons[fg_console].d;

	struct vc_data *vc = vc_cons[fg_console].d;

	unsigned short keysym, *key_map;

	unsigned short keysym, *key_map;