[Linux-kernel-commits] [5284] trunk/sound/soc/blackfin/bf5xx-ac97.c: tweak how we define SPORT peripherals to minimize part-specific logic throughout the file and protect against bitrot

[vapier]

Title: [5284] trunk/sound/soc/blackfin/bf5xx-ac97.c: tweak how we define SPORT peripherals to minimize part-specific logic throughout the file and protect against bitrot

Revision

5284

Author

vapier

Date

2008-09-11 10:08:18 -0500 (Thu, 11 Sep 2008)

Log Message

tweak how we define SPORT peripherals to minimize part-specific logic throughout the file and protect against bitrot

Modified Paths

trunk/sound/soc/blackfin/bf5xx-ac97.c

Diff

Modified: trunk/sound/soc/blackfin/bf5xx-ac97.c (5283 => 5284)

--- trunk/sound/soc/blackfin/bf5xx-ac97.c	2008-09-11 15:07:12 UTC (rev 5283)
+++ trunk/sound/soc/blackfin/bf5xx-ac97.c	2008-09-11 15:08:18 UTC (rev 5284)
@@ -55,7 +55,6 @@
 static int *cmd_count;
 static int sport_num = CONFIG_SND_BF5XX_SPORT_NUM;
 
-#if defined(CONFIG_BF54x)
 static struct sport_param sport_params[4] = {
 	{
 		.dma_rx_chan	= CH_SPORT0_RX,
@@ -63,41 +62,31 @@
 		.err_irq	= IRQ_SPORT0_ERR,
 		.regs		= (struct sport_register *)SPORT0_TCR1,
 	},
+#ifdef PIN_REQ_SPORT_1
 	{
 		.dma_rx_chan	= CH_SPORT1_RX,
 		.dma_tx_chan	= CH_SPORT1_TX,
 		.err_irq	= IRQ_SPORT1_ERR,
 		.regs		= (struct sport_register *)SPORT1_TCR1,
 	},
+#endif
+#ifdef PIN_REQ_SPORT_2
 	{
 		.dma_rx_chan	= CH_SPORT2_RX,
 		.dma_tx_chan	= CH_SPORT2_TX,
 		.err_irq	= IRQ_SPORT2_ERR,
 		.regs		= (struct sport_register *)SPORT2_TCR1,
 	},
+#endif
+#ifdef PIN_REQ_SPORT_1
 	{
 		.dma_rx_chan	= CH_SPORT3_RX,
 		.dma_tx_chan	= CH_SPORT3_TX,
 		.err_irq	= IRQ_SPORT3_ERR,
 		.regs		= (struct sport_register *)SPORT3_TCR1,
 	}
-};
-#else
-static struct sport_param sport_params[2] = {
-	{
-		.dma_rx_chan	= CH_SPORT0_RX,
-		.dma_tx_chan	= CH_SPORT0_TX,
-		.err_irq	= IRQ_SPORT0_ERROR,
-		.regs		= (struct sport_register *)SPORT0_TCR1,
-	},
-	{
-		.dma_rx_chan	= CH_SPORT1_RX,
-		.dma_tx_chan	= CH_SPORT1_TX,
-		.err_irq	= IRQ_SPORT1_ERROR,
-		.regs		= (struct sport_register *)SPORT1_TCR1,
-	}
-};
 #endif
+};
 
 void bf5xx_pcm_to_ac97(struct ac97_frame *dst, const __u32 *src, \
 		size_t count)
@@ -318,12 +307,18 @@
 static int bf5xx_ac97_probe(struct platform_device *pdev)
 {
 	int ret;
-#if defined(CONFIG_BF54x)
-	u16 sport_req[][7] = {PIN_REQ_SPORT_0, PIN_REQ_SPORT_1,
-				 PIN_REQ_SPORT_2, PIN_REQ_SPORT_3};
-#else
-	u16 sport_req[][7] = {PIN_REQ_SPORT_0, PIN_REQ_SPORT_1};
+	u16 sport_req[][7] = {
+		PIN_REQ_SPORT_0,
+#ifdef PIN_REQ_SPORT_1
+		PIN_REQ_SPORT_1,
 #endif
+#ifdef PIN_REQ_SPORT_2
+		PIN_REQ_SPORT_2,
+#endif
+#ifdef PIN_REQ_SPORT_3
+		PIN_REQ_SPORT_3,
+#endif
+	};
 	cmd_count = (int *)get_zeroed_page(GFP_KERNEL);
 	if (cmd_count == NULL)
 		return -ENOMEM;
@@ -331,7 +326,7 @@
 	if (peripheral_request_list(&sport_req[sport_num][0], "soc-audio")) {
 		pr_err("Requesting Peripherals failed\n");
 		return -EFAULT;
-		}
+	}
 
 #ifdef CONFIG_SND_BF5XX_HAVE_COLD_RESET
 	/* Request PB3 as reset pin */

_______________________________________________
Linux-kernel-commits mailing list
Linux-kernel-commits@blackfin.uclinux.org
http://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits