aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Victor <andrew@sanpeople.com>2006-10-23 08:53:20 -0400
committerPierre Ossman <drzeus@drzeus.cx>2006-12-11 03:47:21 -0500
commitf3a8efa90b1aab16ead76ad7e22d9c5fc2045400 (patch)
tree7b7225d92f0fe595a5a5886c4049371b16c83069
parentdf05a303e3b8a0c32764941200bec76d729126bc (diff)
AT91 MMC 5 : Minor cleanups
A number of small cleanups to the AT91RM9200 MMC driver: - fix warnings generated by pr_debug(). - prepend "AT91 MMC:" to printk() messages. Signed-off-by: Andrew Victor <andrew@sanpeople.com> Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
-rw-r--r--drivers/mmc/at91_mci.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/at91_mci.c
index 2f11d67d8d07..d500b6b21ea0 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/at91_mci.c
@@ -336,10 +336,10 @@ static void at91_mci_handle_transmitted(struct at91mci_host *host)
336static void at91_mci_enable(struct at91mci_host *host) 336static void at91_mci_enable(struct at91mci_host *host)
337{ 337{
338 at91_mci_write(host, AT91_MCI_CR, AT91_MCI_MCIEN); 338 at91_mci_write(host, AT91_MCI_CR, AT91_MCI_MCIEN);
339 at91_mci_write(host, AT91_MCI_IDR, 0xFFFFFFFF); 339 at91_mci_write(host, AT91_MCI_IDR, 0xffffffff);
340 at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC); 340 at91_mci_write(host, AT91_MCI_DTOR, AT91_MCI_DTOMUL_1M | AT91_MCI_DTOCYC);
341 at91_mci_write(host, AT91_MCI_MR, 0x834A); 341 at91_mci_write(host, AT91_MCI_MR, AT91_MCI_PDCMODE | 0x34a);
342 at91_mci_write(host, AT91_MCI_SDCR, 0x0); 342 at91_mci_write(host, AT91_MCI_SDCR, 0);
343} 343}
344 344
345/* 345/*
@@ -420,7 +420,7 @@ static unsigned int at91_mci_send_command(struct at91mci_host *host, struct mmc_
420 /* 420 /*
421 * Set the arguments and send the command 421 * Set the arguments and send the command
422 */ 422 */
423 pr_debug("Sending command %d as %08X, arg = %08X, blocks = %d, length = %d (MR = %08lX)\n", 423 pr_debug("Sending command %d as %08X, arg = %08X, blocks = %d, length = %d (MR = %08X)\n",
424 cmd->opcode, cmdr, cmd->arg, blocks, block_length, at91_mci_read(host, AT91_MCI_MR)); 424 cmd->opcode, cmdr, cmd->arg, blocks, block_length, at91_mci_read(host, AT91_MCI_MR));
425 425
426 if (!data) { 426 if (!data) {
@@ -659,7 +659,7 @@ static irqreturn_t at91_mci_irq(int irq, void *devid)
659 int_status = at91_mci_read(host, AT91_MCI_SR); 659 int_status = at91_mci_read(host, AT91_MCI_SR);
660 int_mask = at91_mci_read(host, AT91_MCI_IMR); 660 int_mask = at91_mci_read(host, AT91_MCI_IMR);
661 661
662 pr_debug("MCI irq: status = %08X, %08lX, %08lX\n", int_status, int_mask, 662 pr_debug("MCI irq: status = %08X, %08X, %08X\n", int_status, int_mask,
663 int_status & int_mask); 663 int_status & int_mask);
664 664
665 int_status = int_status & int_mask; 665 int_status = int_status & int_mask;
@@ -825,7 +825,7 @@ static int at91_mci_probe(struct platform_device *pdev)
825#ifdef SUPPORT_4WIRE 825#ifdef SUPPORT_4WIRE
826 mmc->caps |= MMC_CAP_4_BIT_DATA; 826 mmc->caps |= MMC_CAP_4_BIT_DATA;
827#else 827#else
828 printk("MMC: 4 wire bus mode not supported by this driver - using 1 wire\n"); 828 printk("AT91 MMC: 4 wire bus mode not supported by this driver - using 1 wire\n");
829#endif 829#endif
830 } 830 }
831 831
@@ -864,7 +864,7 @@ static int at91_mci_probe(struct platform_device *pdev)
864 host->irq = platform_get_irq(pdev, 0); 864 host->irq = platform_get_irq(pdev, 0);
865 ret = request_irq(host->irq, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host); 865 ret = request_irq(host->irq, at91_mci_irq, IRQF_SHARED, DRIVER_NAME, host);
866 if (ret) { 866 if (ret) {
867 printk(KERN_ERR "Failed to request MCI interrupt\n"); 867 printk(KERN_ERR "AT91 MMC: Failed to request MCI interrupt\n");
868 clk_disable(host->mci_clk); 868 clk_disable(host->mci_clk);
869 clk_put(host->mci_clk); 869 clk_put(host->mci_clk);
870 mmc_free_host(mmc); 870 mmc_free_host(mmc);
@@ -892,10 +892,10 @@ static int at91_mci_probe(struct platform_device *pdev)
892 ret = request_irq(host->board->det_pin, at91_mmc_det_irq, 892 ret = request_irq(host->board->det_pin, at91_mmc_det_irq,
893 0, DRIVER_NAME, host); 893 0, DRIVER_NAME, host);
894 if (ret) 894 if (ret)
895 printk(KERN_ERR "couldn't allocate MMC detect irq\n"); 895 printk(KERN_ERR "AT91 MMC: Couldn't allocate MMC detect irq\n");
896 } 896 }
897 897
898 pr_debug(KERN_INFO "Added MCI driver\n"); 898 pr_debug("Added MCI driver\n");
899 899
900 return 0; 900 return 0;
901} 901}