Remove unused and redundant variables. The unused variables were unused prior
to this patchset. que_mmc_host is now just available through the device struct.
Signed-off-by: Bernard Blackham <[EMAIL PROTECTED]>
Index: linux-davinci-2.6.24.git/drivers/mmc/host/davinci_mmc.c
===================================================================
--- linux-davinci-2.6.24.git.orig/drivers/mmc/host/davinci_mmc.c
2008-02-15 20:42:58.000000000 +0900
+++ linux-davinci-2.6.24.git/drivers/mmc/host/davinci_mmc.c 2008-02-15
20:43:41.000000000 +0900
@@ -344,8 +344,6 @@
host->do_dma = 1;
- host->dma_state = 0;
-
mmc_davinci_send_dma_request(host, req);
return 0;
@@ -704,7 +702,6 @@
mmc_davinci_start_command(host, req->cmd);
} else {
/* Queue up the request as card dectection is being excuted */
- host->que_mmc_host = mmc;
host->que_mmc_request = req;
spin_lock_irqsave(&host->lock, flags);
host->is_req_queued_up = 1;
@@ -818,7 +815,6 @@
}
if (!data->stop) {
- host->req = NULL;
spin_lock_irqsave(&host->lock, flags);
host->is_card_busy = 0;
spin_unlock_irqrestore(&host->lock, flags);
@@ -854,7 +850,6 @@
}
if (host->data == NULL || cmd->error) {
- host->req = NULL;
if (cmd->error == -ETIMEDOUT)
cmd->mrq->cmd->retries = 0;
spin_lock_irqsave(&host->lock, flags);
@@ -1074,7 +1069,7 @@
spin_unlock_irqrestore(&host->lock, flags);
if (host->is_req_queued_up) {
- mmc_davinci_request(host->que_mmc_host,
+ mmc_davinci_request(host->mmc,
host->que_mmc_request);
spin_lock_irqsave(&host->lock, flags);
host->is_req_queued_up = 0;
@@ -1104,7 +1099,7 @@
spin_unlock_irqrestore(&host->lock, flags);
if (host->is_req_queued_up) {
- mmc_davinci_request(host->que_mmc_host,
+ mmc_davinci_request(host->mmc,
host->que_mmc_request);
spin_lock_irqsave(&host->lock, flags);
host->is_req_queued_up = 0;
Index: linux-davinci-2.6.24.git/drivers/mmc/host/davinci_mmc.h
===================================================================
--- linux-davinci-2.6.24.git.orig/drivers/mmc/host/davinci_mmc.h
2008-02-15 20:42:58.000000000 +0900
+++ linux-davinci-2.6.24.git/drivers/mmc/host/davinci_mmc.h 2008-02-15
20:43:41.000000000 +0900
@@ -161,14 +161,9 @@
};
struct mmc_davinci_host {
- int initialized;
- int suspended;
- struct mmc_request *req;
struct mmc_command *cmd;
struct mmc_data *data;
struct mmc_host *mmc;
- struct device *dev;
- unsigned char id;
struct clk *clk;
unsigned int mmc_input_clk;
void __iomem *base;
@@ -182,11 +177,9 @@
unsigned char data_dir;
u8 *buffer;
u32 bytes_left;
- int power_pin;
bool use_dma;
bool do_dma;
- struct completion dma_completion;
struct timer_list timer;
unsigned int is_core_command:1;
@@ -200,8 +193,6 @@
unsigned int sg_len;
int sg_idx;
unsigned int buffer_bytes_left;
- unsigned int dma_len;
- int dma_state;
unsigned int option_read;
unsigned int option_write;
@@ -221,9 +212,6 @@
unsigned int is_req_queued_up:1;
/* data structure to queue one request */
- struct mmc_host *que_mmc_host;
-
- /* data structure to queue one request */
struct mmc_request *que_mmc_request;
/* tells whether card is initizlzed or not */
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
