From 1472555d4a0c5be6e438af9cbdb2e9b98b12cb97 Mon Sep 17 00:00:00 2001
From: Oleksij Rempel <bug-track@fisher-privat.net>
Date: Fri, 4 May 2012 20:02:46 +0200
Subject: [PATCH] --- yaml --- r: 304573 b: refs/heads/master c:
 60c1530170008393901f03d018a2f89ad3022a0d h: refs/heads/master i:   304571:
 fb9181af3a83e62ef36ddecd845bbab25e851d59 v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/staging/rts5139/rts51x.c      | 4 ++--
 trunk/drivers/staging/rts5139/rts51x.h      | 1 -
 trunk/drivers/staging/rts5139/rts51x_card.c | 8 ++++----
 trunk/drivers/staging/rts5139/rts51x_card.h | 3 ---
 5 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index da9e7e0fce4f..62e122a2c598 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 63bb174d9c8acdc077dcb99b51c3f8f89bf7de6d
+refs/heads/master: 60c1530170008393901f03d018a2f89ad3022a0d
diff --git a/trunk/drivers/staging/rts5139/rts51x.c b/trunk/drivers/staging/rts5139/rts51x.c
index 48cb68497b1d..7726a1a53b8c 100644
--- a/trunk/drivers/staging/rts5139/rts51x.c
+++ b/trunk/drivers/staging/rts5139/rts51x.c
@@ -108,7 +108,7 @@ static inline void usb_autopm_disable(struct usb_interface *intf)
 	usb_autopm_get_interface(intf);
 }
 
-void rts51x_try_to_enter_ss(struct rts51x_chip *chip)
+static void rts51x_try_to_enter_ss(struct rts51x_chip *chip)
 {
 	RTS51X_DEBUGP("Ready to enter SS state\n");
 	usb_autopm_enable(chip->usb->pusb_intf);
@@ -201,7 +201,7 @@ int rts51x_reset_resume(struct usb_interface *iface)
 
 #else /* CONFIG_PM */
 
-void rts51x_try_to_enter_ss(struct rts51x_chip *chip)
+static void rts51x_try_to_enter_ss(struct rts51x_chip *chip)
 {
 }
 
diff --git a/trunk/drivers/staging/rts5139/rts51x.h b/trunk/drivers/staging/rts5139/rts51x.h
index 40ca432a9024..2d2b315571af 100644
--- a/trunk/drivers/staging/rts5139/rts51x.h
+++ b/trunk/drivers/staging/rts5139/rts51x.h
@@ -183,7 +183,6 @@ enum xfer_buf_dir { TO_XFER_BUF, FROM_XFER_BUF };
 
 /* General routines provided by the usb-storage standard core */
 #ifdef CONFIG_PM
-void rts51x_try_to_enter_ss(struct rts51x_chip *chip);
 void rts51x_try_to_exit_ss(struct rts51x_chip *chip);
 int rts51x_suspend(struct usb_interface *iface, pm_message_t message);
 int rts51x_resume(struct usb_interface *iface);
diff --git a/trunk/drivers/staging/rts5139/rts51x_card.c b/trunk/drivers/staging/rts5139/rts51x_card.c
index bb86c5b5f5fd..3c12dfb11b07 100644
--- a/trunk/drivers/staging/rts5139/rts51x_card.c
+++ b/trunk/drivers/staging/rts5139/rts51x_card.c
@@ -93,7 +93,7 @@ void do_remaining_work(struct rts51x_chip *chip)
 		ms_cleanup_work(chip);
 }
 
-void do_reset_xd_card(struct rts51x_chip *chip)
+static void do_reset_xd_card(struct rts51x_chip *chip)
 {
 	int retval;
 
@@ -147,7 +147,7 @@ void do_reset_sd_card(struct rts51x_chip *chip)
 	}
 }
 
-void do_reset_ms_card(struct rts51x_chip *chip)
+static void do_reset_ms_card(struct rts51x_chip *chip)
 {
 	int retval;
 
@@ -174,7 +174,7 @@ void do_reset_ms_card(struct rts51x_chip *chip)
 	}
 }
 
-void card_cd_debounce(struct rts51x_chip *chip, u8 *need_reset,
+static void card_cd_debounce(struct rts51x_chip *chip, u8 *need_reset,
 		      u8 *need_release)
 {
 	int retval;
@@ -701,7 +701,7 @@ u8 get_lun_card(struct rts51x_chip *chip, unsigned int lun)
 	return 0;
 }
 
-int card_share_mode(struct rts51x_chip *chip, int card)
+static int card_share_mode(struct rts51x_chip *chip, int card)
 {
 	u8 value;
 
diff --git a/trunk/drivers/staging/rts5139/rts51x_card.h b/trunk/drivers/staging/rts5139/rts51x_card.h
index ac3c1e741ab9..7a2c4ab02ed6 100644
--- a/trunk/drivers/staging/rts5139/rts51x_card.h
+++ b/trunk/drivers/staging/rts5139/rts51x_card.h
@@ -744,9 +744,7 @@
 int monitor_card_cd(struct rts51x_chip *chip, u8 card);
 
 void do_remaining_work(struct rts51x_chip *chip);
-void do_reset_xd_card(struct rts51x_chip *chip);
 void do_reset_sd_card(struct rts51x_chip *chip);
-void do_reset_ms_card(struct rts51x_chip *chip);
 void rts51x_init_cards(struct rts51x_chip *chip);
 void rts51x_release_cards(struct rts51x_chip *chip);
 int switch_ssc_clock(struct rts51x_chip *chip, int clk);
@@ -754,7 +752,6 @@ int switch_normal_clock(struct rts51x_chip *chip, int clk);
 int card_rw(struct scsi_cmnd *srb, struct rts51x_chip *chip, u32 sec_addr,
 	    u16 sec_cnt);
 u8 get_lun_card(struct rts51x_chip *chip, unsigned int lun);
-int card_share_mode(struct rts51x_chip *chip, int card);
 int rts51x_select_card(struct rts51x_chip *chip, int card);
 void eject_card(struct rts51x_chip *chip, unsigned int lun);
 void trans_dma_enable(enum dma_data_direction dir, struct rts51x_chip *chip,