Commit 52c1da39 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] make various thing static 



Another rollup of patches which give various symbols static scope

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d763b7a4

drivers/media/common/saa7146_fops.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static struct file_operations video_fops = 
	.llseek		= no_llseek,

};



void vv_callback(struct saa7146_dev *dev, unsigned long status)

static void vv_callback(struct saa7146_dev *dev, unsigned long status)

{

	u32 isr = status;

drivers/media/video/tvaudio.c

+11 −11
Original line number Diff line number Diff line
@@ -1236,17 +1236,17 @@ static int ta8874z_checkit(struct CHIPSTATE *chip) 
/* audio chip descriptions - struct CHIPDESC                              */



/* insmod options to enable/disable individual audio chips */

int tda8425  = 1;

int tda9840  = 1;

int tda9850  = 1;

int tda9855  = 1;

int tda9873  = 1;

int tda9874a = 1;

int tea6300  = 0;  // address clash with msp34xx

int tea6320  = 0;  // address clash with msp34xx

int tea6420  = 1;

int pic16c54 = 1;

int ta8874z  = 0;  // address clash with tda9840

static int tda8425  = 1;

static int tda9840  = 1;

static int tda9850  = 1;

static int tda9855  = 1;

static int tda9873  = 1;

static int tda9874a = 1;

static int tea6300  = 0;  // address clash with msp34xx

static int tea6320  = 0;  // address clash with msp34xx

static int tea6420  = 1;

static int pic16c54 = 1;

static int ta8874z  = 0;  // address clash with tda9840



module_param(tda8425, int, 0444);

module_param(tda9840, int, 0444);

drivers/scsi/hosts.c

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static struct class shost_class = { 
 * @shost:	pointer to struct Scsi_Host

 * recovery:	recovery requested to run.

 **/

void scsi_host_cancel(struct Scsi_Host *shost, int recovery)

static void scsi_host_cancel(struct Scsi_Host *shost, int recovery)

{

	struct scsi_device *sdev;

drivers/scsi/scsi.c

+4 −2
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ 
#include "scsi_priv.h"

#include "scsi_logging.h"



static void scsi_done(struct scsi_cmnd *cmd);

static int scsi_retry_command(struct scsi_cmnd *cmd);



/*

 * Definitions and constants.
@@ -741,7 +743,7 @@ static DEFINE_PER_CPU(struct list_head, scsi_done_q); 
 *

 * This function is interrupt context safe.

 */

void scsi_done(struct scsi_cmnd *cmd)

static void scsi_done(struct scsi_cmnd *cmd)

{

	/*

	 * We don't have to worry about this one timing out any more.
@@ -836,7 +838,7 @@ static void scsi_softirq(struct softirq_action *h) 
 *              level drivers should not become re-entrant as a result of

 *              this.

 */

int scsi_retry_command(struct scsi_cmnd *cmd)

static int scsi_retry_command(struct scsi_cmnd *cmd)

{

	/*

	 * Restore the SCSI command state.

drivers/scsi/scsi_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -1783,7 +1783,7 @@ static void __exit scsi_debug_exit(void) 
device_initcall(scsi_debug_init);

module_exit(scsi_debug_exit);



void pseudo_0_release(struct device * dev)

static void pseudo_0_release(struct device * dev)

{

	if (SCSI_DEBUG_OPT_NOISE & scsi_debug_opts)

		printk(KERN_INFO "scsi_debug: pseudo_0_release() called\n");