diff mbox

mmc: sdhci-pci: Fix checkpatch.pl errors

Message ID 1302027193-15696-1-git-send-email-2ameya@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ameya Palande April 5, 2011, 6:13 p.m. UTC 
This patch fixes 21 errors and 6 warnings reported by checkpatch.pl

Signed-off-by: Ameya Palande <2ameya@gmail.com>
---
 drivers/mmc/host/sdhci-pci.c |   44 ++++++++++++++++++++---------------------
 1 files changed, 21 insertions(+), 23 deletions(-)

Comments

Wolfram Sang April 8, 2011, 6:55 p.m. UTC | #1 
Hi Ameya,

On Tue, Apr 05, 2011 at 09:13:13PM +0300, Ameya Palande wrote:
> This patch fixes 21 errors and 6 warnings reported by checkpatch.pl
> 
> Signed-off-by: Ameya Palande <2ameya@gmail.com>

Looks okay to me. Have you checked that the binary does not differ?

Regards,

   Wolfram
Wolfram Sang April 11, 2011, 2:35 p.m. UTC | #2 
On Mon, Apr 11, 2011 at 12:47:02PM +0300, Ameya Palande wrote:
> Hi Wolfram,
> 
> On Fri, Apr 8, 2011 at 9:55 PM, Wolfram Sang <w.sang@pengutronix.de> wrote:
> > Hi Ameya,
> >
> > On Tue, Apr 05, 2011 at 09:13:13PM +0300, Ameya Palande wrote:
> >> This patch fixes 21 errors and 6 warnings reported by checkpatch.pl
> >>
> >> Signed-off-by: Ameya Palande <2ameya@gmail.com>
> >
> > Looks okay to me. Have you checked that the binary does not differ?
> 
> Thanks for your review! Binaries are same.

Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Chris Ball April 11, 2011, 9:13 p.m. UTC | #3 
Hi Ameya,

On Tue, Apr 05 2011, Ameya Palande wrote:
> This patch fixes 21 errors and 6 warnings reported by checkpatch.pl
>
> Signed-off-by: Ameya Palande <2ameya@gmail.com>

Thanks, pushed to mmc-next for .40 with Wolfram's Reviewed-by.

- Chris.
Ameya Palande April 12, 2011, 7:04 a.m. UTC | #4 
On Tue, Apr 12, 2011 at 12:13 AM, Chris Ball <cjb@laptop.org> wrote:
> Hi Ameya,
>
> On Tue, Apr 05 2011, Ameya Palande wrote:
>> This patch fixes 21 errors and 6 warnings reported by checkpatch.pl
>>
>> Signed-off-by: Ameya Palande <2ameya@gmail.com>
>
> Thanks, pushed to mmc-next for .40 with Wolfram's Reviewed-by.

Thanks Chris!
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c
index a136be7..96623e1 100644
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
@@ -18,11 +18,9 @@ 
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
 #include <linux/device.h>
-
 #include <linux/mmc/host.h>
-
-#include <asm/scatterlist.h>
-#include <asm/io.h>
+#include <linux/scatterlist.h>
+#include <linux/io.h>
 
 #include "sdhci.h"
 
@@ -46,14 +44,14 @@  struct sdhci_pci_slot;
 struct sdhci_pci_fixes {
 	unsigned int		quirks;
 
-	int			(*probe)(struct sdhci_pci_chip*);
+	int			(*probe) (struct sdhci_pci_chip *);
 
-	int			(*probe_slot)(struct sdhci_pci_slot*);
-	void			(*remove_slot)(struct sdhci_pci_slot*, int);
+	int			(*probe_slot) (struct sdhci_pci_slot *);
+	void			(*remove_slot) (struct sdhci_pci_slot *, int);
 
-	int			(*suspend)(struct sdhci_pci_chip*,
+	int			(*suspend) (struct sdhci_pci_chip *,
 					pm_message_t);
-	int			(*resume)(struct sdhci_pci_chip*);
+	int			(*resume) (struct sdhci_pci_chip *);
 };
 
 struct sdhci_pci_slot {
@@ -402,7 +400,7 @@  static int jmicron_suspend(struct sdhci_pci_chip *chip, pm_message_t state)
 
 	if (chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB38X_MMC ||
 	    chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB388_ESD) {
-		for (i = 0;i < chip->num_slots;i++)
+		for (i = 0; i < chip->num_slots; i++)
 			jmicron_enable_mmc(chip->slots[i]->host, 0);
 	}
 
@@ -415,7 +413,7 @@  static int jmicron_resume(struct sdhci_pci_chip *chip)
 
 	if (chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB38X_MMC ||
 	    chip->pdev->device == PCI_DEVICE_ID_JMICRON_JMB388_ESD) {
-		for (i = 0;i < chip->num_slots;i++)
+		for (i = 0; i < chip->num_slots; i++)
 			jmicron_enable_mmc(chip->slots[i]->host, 1);
 	}
 
@@ -798,7 +796,7 @@  static struct sdhci_ops sdhci_pci_ops = {
 
 #ifdef CONFIG_PM
 
-static int sdhci_pci_suspend (struct pci_dev *pdev, pm_message_t state)
+static int sdhci_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
 	struct sdhci_pci_chip *chip;
 	struct sdhci_pci_slot *slot;
@@ -810,7 +808,7 @@  static int sdhci_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 	if (!chip)
 		return 0;
 
-	for (i = 0;i < chip->num_slots;i++) {
+	for (i = 0; i < chip->num_slots; i++) {
 		slot = chip->slots[i];
 		if (!slot)
 			continue;
@@ -818,7 +816,7 @@  static int sdhci_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 		ret = sdhci_suspend_host(slot->host, state);
 
 		if (ret) {
-			for (i--;i >= 0;i--)
+			for (i--; i >= 0; i--)
 				sdhci_resume_host(chip->slots[i]->host);
 			return ret;
 		}
@@ -833,7 +831,7 @@  static int sdhci_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 	if (chip->fixes && chip->fixes->suspend) {
 		ret = chip->fixes->suspend(chip, state);
 		if (ret) {
-			for (i = chip->num_slots - 1;i >= 0;i--)
+			for (i = chip->num_slots - 1; i >= 0; i--)
 				sdhci_resume_host(chip->slots[i]->host);
 			return ret;
 		}
@@ -855,7 +853,7 @@  static int sdhci_pci_suspend (struct pci_dev *pdev, pm_message_t state)
 	return 0;
 }
 
-static int sdhci_pci_resume (struct pci_dev *pdev)
+static int sdhci_pci_resume(struct pci_dev *pdev)
 {
 	struct sdhci_pci_chip *chip;
 	struct sdhci_pci_slot *slot;
@@ -877,7 +875,7 @@  static int sdhci_pci_resume (struct pci_dev *pdev)
 			return ret;
 	}
 
-	for (i = 0;i < chip->num_slots;i++) {
+	for (i = 0; i < chip->num_slots; i++) {
 		slot = chip->slots[i];
 		if (!slot)
 			continue;
@@ -1058,7 +1056,7 @@  static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
 	}
 
 	chip->pdev = pdev;
-	chip->fixes = (const struct sdhci_pci_fixes*)ent->driver_data;
+	chip->fixes = (const struct sdhci_pci_fixes *)ent->driver_data;
 	if (chip->fixes)
 		chip->quirks = chip->fixes->quirks;
 	chip->num_slots = slots;
@@ -1073,10 +1071,10 @@  static int __devinit sdhci_pci_probe(struct pci_dev *pdev,
 
 	slots = chip->num_slots;	/* Quirk may have changed this */
 
-	for (i = 0;i < slots;i++) {
+	for (i = 0; i < slots; i++) {
 		slot = sdhci_pci_probe_slot(pdev, chip, first_bar + i);
 		if (IS_ERR(slot)) {
-			for (i--;i >= 0;i--)
+			for (i--; i >= 0; i--)
 				sdhci_pci_remove_slot(chip->slots[i]);
 			ret = PTR_ERR(slot);
 			goto free;
@@ -1104,7 +1102,7 @@  static void __devexit sdhci_pci_remove(struct pci_dev *pdev)
 	chip = pci_get_drvdata(pdev);
 
 	if (chip) {
-		for (i = 0;i < chip->num_slots; i++)
+		for (i = 0; i < chip->num_slots; i++)
 			sdhci_pci_remove_slot(chip->slots[i]);
 
 		pci_set_drvdata(pdev, NULL);
@@ -1115,9 +1113,9 @@  static void __devexit sdhci_pci_remove(struct pci_dev *pdev)
 }
 
 static struct pci_driver sdhci_driver = {
-	.name = 	"sdhci-pci",
+	.name =		"sdhci-pci",
 	.id_table =	pci_ids,
-	.probe = 	sdhci_pci_probe,
+	.probe =	sdhci_pci_probe,
 	.remove =	__devexit_p(sdhci_pci_remove),
 	.suspend =	sdhci_pci_suspend,
 	.resume	=	sdhci_pci_resume,