Bugzilla 510: Update to code review fixes following L2618.2

Patch for Bugzilla 510: Update to code review fixes following L2618.2
Changes made to fix bugs and/or port to 2.6.19.2 after including GSO
L2618-2 patches as discovered and discussed in the code review.

http://www.bitshrine.org/gpp/linux-2.6.22-mx-Bugzilla-510-Update-to-code-review-fixes-f.patch

10 files changed, 10 insertions, 16 deletions

diff --git a/arch/arm/mach-mx3/mxc_pm.c b/arch/arm/mach-mx3/mxc_pm.c
index bed502168261..bf681b04e0e8 100644
--- a/arch/arm/mach-mx3/mxc_pm.c
+++ b/arch/arm/mach-mx3/mxc_pm.c
@@ -304,7 +304,6 @@ void mxc_pm_lowpower(int mode)
 		__raw_writel(INT_GPIO1, AVIC_INTDISNUM);
 
 		/* work-around for SR mode after camera related test */
-		mxc_clks_enable(CSI_BAUD);
 		__raw_writel(0x51, IPU_CONF);
 		break;
 
@@ -337,7 +336,6 @@ void mxc_pm_lowpower(int mode)
 
 	/* work-around for SR mode after camera related test */
 	__raw_writel(ipu_conf, IPU_CONF);
-	mxc_clks_disable(CSI_BAUD);
 
 	__raw_writel(INT_GPT, AVIC_INTENNUM);
 	__raw_writel(INT_GPIO1, AVIC_INTENNUM);
diff --git a/arch/arm/plat-mxc/sdma/sdma.c b/arch/arm/plat-mxc/sdma/sdma.c
index a104eb5a56d2..6ad494b25cda 100644
--- a/arch/arm/plat-mxc/sdma/sdma.c
+++ b/arch/arm/plat-mxc/sdma/sdma.c
@@ -366,7 +366,6 @@ static unsigned short sdma_get_pc(sdma_periphT peripheral_type,
 	}
 
 	return res;
-
 }
 
 /*!
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index e689ecab1d39..afcb521f4d8a 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -866,7 +866,7 @@ config BLK_DEV_IDE_BAST
 
 config BLK_DEV_IDE_MXC
         tristate "Freescale MXC IDE support"
-        depends on ARM && ( ARCH_MX3 || ARCH_MX27)
+        depends on ARM && (ARCH_MX3 || ARCH_MX27)
         help
           Say Y here if you want to support the IDE controller on the
           Freescale iMX3 processor.
diff --git a/drivers/mxc/security/rng/include/shw_internals.h b/drivers/mxc/security/rng/include/shw_internals.h
index 630ceb1ee377..f1e19c7fa075 100644
--- a/drivers/mxc/security/rng/include/shw_internals.h
+++ b/drivers/mxc/security/rng/include/shw_internals.h
@@ -150,8 +150,9 @@ static os_error_code add_entropy(fsl_shw_uco_t * user_ctx,
 
 #if defined(LINUX_VERSION_CODE)
 
-MODULE_AUTHOR("Freescale Semiconductor");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("Device Driver for FSL SHW API");
+MODULE_LICENSE("GPL");
 
 #endif				/* LINUX_VERSION_CODE */
 
diff --git a/drivers/mxc/security/sahara2/Makefile b/drivers/mxc/security/sahara2/Makefile
index ad24bab36506..2688a875ee5a 100644
--- a/drivers/mxc/security/sahara2/Makefile
+++ b/drivers/mxc/security/sahara2/Makefile
@@ -38,10 +38,6 @@ endif
 
 EXTRA_CFLAGS += -Idrivers/mxc/security/sahara2/include
 
-# handle buggy BSP -- uncomment if these are undefined during build
-#EXTRA_CFLAGS += -DSAHARA_BASE_ADDR=HAC_BASE_ADDR -DINT_SAHARA=INT_HAC_RTIC
-
-
 obj-$(CONFIG_MXC_SAHARA) += sahara.o
 
 sahara-objs := $(SOURCES:.c=.o) $(API_SOURCES:.c=.o)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 1b854bf07b09..9d2d8145b876 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -147,7 +147,7 @@ static void gfar_set_mac_for_addr(struct net_device *dev, int num, u8 *addr);
 
 extern const struct ethtool_ops gfar_ethtool_ops;
 
-MODULE_AUTHOR("Freescale Semiconductor, Inc");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("Gianfar Ethernet Driver");
 MODULE_LICENSE("GPL");
 
diff --git a/drivers/net/irda/Makefile b/drivers/net/irda/Makefile
index 1e42c9702d25..ad99af5a29ce 100644
--- a/drivers/net/irda/Makefile
+++ b/drivers/net/irda/Makefile
@@ -13,7 +13,6 @@ obj-$(CONFIG_SIGMATEL_FIR)	+= stir4200.o
 obj-$(CONFIG_NSC_FIR)		+= nsc-ircc.o
 obj-$(CONFIG_WINBOND_FIR)	+= w83977af_ir.o
 obj-$(CONFIG_SA1100_FIR)	+= sa1100_ir.o
-obj-$(CONFIG_MXC_FIR)		+= mxc_ir.o
 obj-$(CONFIG_TOSHIBA_FIR)	+= donauboe.o
 obj-$(CONFIG_SMC_IRCC_FIR)	+= smsc-ircc2.o
 obj-$(CONFIG_ALI_FIR)		+= ali-ircc.o
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 18b731bb4da1..953ecde43013 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3994,7 +3994,7 @@ static void __exit ucc_geth_exit(void)
 module_init(ucc_geth_init);
 module_exit(ucc_geth_exit);
 
-MODULE_AUTHOR("Freescale Semiconductor, Inc");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION(DRV_DESC);
 MODULE_VERSION(DRV_VERSION);
 MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/arcotg_udc.c b/drivers/usb/gadget/arcotg_udc.c
index 85eace5e0725..ee91d3f578cf 100644
--- a/drivers/usb/gadget/arcotg_udc.c
+++ b/drivers/usb/gadget/arcotg_udc.c
@@ -2890,8 +2890,9 @@ static int __devinit fsl_udc_probe(struct platform_device *pdev)
 	rsrc_start = pdev->resource[0].start;
 	rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1;
 
-	pr_debug("start=0x%x   end=0x%x\n",
-		 pdev->resource[0].start, pdev->resource[0].end);
+	pr_debug("start=0x%lx   end=0x%lx\n",
+		 (unsigned long)pdev->resource[0].start,
+		 (unsigned long)pdev->resource[0].end);
 	pr_debug("rsrc_start=0x%llx  rsrc_len=0x%llx\n", rsrc_start, rsrc_len);
 
 #if 0				/* DDD */
@@ -3062,7 +3063,7 @@ static int udc_suspend(struct arcotg_udc *udc)
 static int fsl_udc_suspend(struct device *dev, pm_message_t state)
 {
 	struct arcotg_udc *udc = (struct arcotg_udc *)dev_get_drvdata(dev);
-	pr_debug("udc: Suspend. state=%d\n", state.event);
+	pr_debug("udc: Suspend.\n");
 	return udc_suspend(udc);
 }
 
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c
index 8164951fb39a..609a6bb2d098 100644
--- a/drivers/w1/masters/mxc_w1.c
+++ b/drivers/w1/masters/mxc_w1.c
@@ -428,5 +428,5 @@ module_init(mxc_w1_init);
 module_exit(mxc_w1_exit);
 
 MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Freescale Semiconductors Inc");
+MODULE_AUTHOR("Freescale Semiconductor, Inc.");
 MODULE_DESCRIPTION("Driver for One-Wire on MXC");