Re: [PATCH 2/3] kbuild: remove unnecessary variable initializaions
On 09/09/2014 12:26, Masahiro Yamada : Clearing obj-y, obj-m, obj-n, obj- in each Makefile is a useless habit. They are non-exported variables; therefore they are always empty whenever descending into each subdirectory. (Moreorver, obj-y and obj-m are also set to empty at the beginning of scripts/Makefile.build) Signed-off-by: Masahiro Yamada yamad...@jp.panasonic.com --- arch/arm/mach-at91/Makefile | 3 --- arch/arm/mach-ebsa110/Makefile| 3 --- arch/arm/mach-ep93xx/Makefile | 3 --- arch/arm/mach-exynos/Makefile | 5 - arch/arm/mach-footbridge/Makefile | 3 --- arch/arm/mach-iop13xx/Makefile| 5 - arch/arm/mach-iop32x/Makefile | 3 --- arch/arm/mach-iop33x/Makefile | 3 --- arch/arm/mach-ks8695/Makefile | 3 --- arch/arm/mach-rpc/Makefile| 4 arch/arm/mach-s3c24xx/Makefile| 5 - arch/arm/mach-s3c64xx/Makefile| 5 - arch/arm/mach-s5pv210/Makefile| 5 - arch/arm/mach-sa1100/Makefile | 3 --- arch/arm/mach-u300/Makefile | 3 --- arch/arm/plat-iop/Makefile| 6 -- arch/arm/plat-omap/Makefile | 3 --- arch/arm/plat-samsung/Makefile| 4 18 files changed, 69 deletions(-) diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 78e9cec..75033839 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -3,9 +3,6 @@ # obj-y:= irq.o gpio.o setup.o sysirq_mask.o -obj-m:= -obj-n:= -obj- := I agree: Acked-by: Nicolas Ferre nicolas.fe...@atmel.com But I have patches that will mess with these changes already queued for 3.18. You may have to signal these conflicts when carrying the patch upstream. Thanks, best regards, obj-$(CONFIG_OLD_CLK_AT91) += clock.o obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o diff --git a/arch/arm/mach-ebsa110/Makefile b/arch/arm/mach-ebsa110/Makefile index 935e4af..a7d68c1 100644 --- a/arch/arm/mach-ebsa110/Makefile +++ b/arch/arm/mach-ebsa110/Makefile @@ -5,6 +5,3 @@ # Object file lists. obj-y:= core.o io.o leds.o -obj-m:= -obj-n:= -obj- := diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile index 0dc51f9..78d427b 100644 --- a/arch/arm/mach-ep93xx/Makefile +++ b/arch/arm/mach-ep93xx/Makefile @@ -2,9 +2,6 @@ # Makefile for the linux kernel. # obj-y:= core.o clock.o -obj-m:= -obj-n:= -obj- := obj-$(CONFIG_EP93XX_DMA) += dma.o diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 788f26d..27ae614 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -7,11 +7,6 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include -obj-y:= -obj-m:= -obj-n:= -obj- := - # Core obj-$(CONFIG_ARCH_EXYNOS)+= exynos.o pmu.o exynos-smc.o firmware.o diff --git a/arch/arm/mach-footbridge/Makefile b/arch/arm/mach-footbridge/Makefile index c3faa3b..e83d5c8 100644 --- a/arch/arm/mach-footbridge/Makefile +++ b/arch/arm/mach-footbridge/Makefile @@ -5,9 +5,6 @@ # Object file lists. obj-y:= common.o dma.o isa-irq.o -obj-m:= -obj-n:= -obj- := pci-y+= dc21285.o pci-$(CONFIG_ARCH_CATS) += cats-pci.o diff --git a/arch/arm/mach-iop13xx/Makefile b/arch/arm/mach-iop13xx/Makefile index cad015f..a3d9260 100644 --- a/arch/arm/mach-iop13xx/Makefile +++ b/arch/arm/mach-iop13xx/Makefile @@ -1,8 +1,3 @@ -obj-y:= -obj-m:= -obj-n:= -obj- := - obj-$(CONFIG_ARCH_IOP13XX) += setup.o obj-$(CONFIG_ARCH_IOP13XX) += irq.o obj-$(CONFIG_ARCH_IOP13XX) += pci.o diff --git a/arch/arm/mach-iop32x/Makefile b/arch/arm/mach-iop32x/Makefile index cfdf8a1..2d4010a 100644 --- a/arch/arm/mach-iop32x/Makefile +++ b/arch/arm/mach-iop32x/Makefile @@ -3,9 +3,6 @@ # obj-y:= irq.o -obj-m:= -obj-n:= -obj- := obj-$(CONFIG_MACH_GLANTANK) += glantank.o obj-$(CONFIG_ARCH_IQ80321) += iq80321.o diff --git a/arch/arm/mach-iop33x/Makefile b/arch/arm/mach-iop33x/Makefile index 90081d8..e95db30 100644 --- a/arch/arm/mach-iop33x/Makefile +++ b/arch/arm/mach-iop33x/Makefile @@ -3,9 +3,6 @@ # obj-y:= irq.o uart.o -obj-m:= -obj-n:= -obj- := obj
Re: [PATCH 1/2] dt-bindings: clock: Move at91.h to dt-bindigs/clock
On 06/03/2014 07:04, Tushar Behera :
Most of the clock related dt-binding header files are located in
dt-bindings/clock folder. It would be good to keep all the similar
header files at a single location.
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
CC: Rob Landley r...@landley.net
CC: Andrew Victor li...@maxim.org.za
CC: Jean-Christophe Plagniol-Villard plagn...@jcrosoft.com
I have just added at91sam9261 and at91sam9rl which appeared in 3.15
merge window and stacked this patch on top of at91-3.15-fixes.
I hope that it will be accepted for 3.15.
Bye,
---
.../devicetree/bindings/clock/at91-clock.txt |2 +-
arch/arm/boot/dts/sama5d3.dtsi |2 +-
arch/arm/boot/dts/sama5d3_mci2.dtsi|2 +-
arch/arm/boot/dts/sama5d3_tcb1.dtsi|2 +-
arch/arm/boot/dts/sama5d3_uart.dtsi|2 +-
include/dt-bindings/{clk = clock}/at91.h |0
6 files changed, 5 insertions(+), 5 deletions(-)
rename include/dt-bindings/{clk = clock}/at91.h (100%)
diff --git a/Documentation/devicetree/bindings/clock/at91-clock.txt
b/Documentation/devicetree/bindings/clock/at91-clock.txt
index cd5e239..6794cdc 100644
--- a/Documentation/devicetree/bindings/clock/at91-clock.txt
+++ b/Documentation/devicetree/bindings/clock/at91-clock.txt
@@ -62,7 +62,7 @@ Required properties for PMC node:
- interrupt-controller : tell that the PMC is an interrupt controller.
- #interrupt-cells : must be set to 1. The first cell encodes the interrupt
id,
and reflect the bit position in the PMC_ER/DR/SR registers.
- You can use the dt macros defined in dt-bindings/clk/at91.h.
+ You can use the dt macros defined in dt-bindings/clock/at91.h.
0 (AT91_PMC_MOSCS) - main oscillator ready
1 (AT91_PMC_LOCKA) - PLL A ready
2 (AT91_PMC_LOCKB) - PLL B ready
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 3d5faf8..8c977b5 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -13,7 +13,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
#include dt-bindings/gpio/gpio.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
model = Atmel SAMA5D3 family SoC;
diff --git a/arch/arm/boot/dts/sama5d3_mci2.dtsi
b/arch/arm/boot/dts/sama5d3_mci2.dtsi
index b029fe7..1b02208 100644
--- a/arch/arm/boot/dts/sama5d3_mci2.dtsi
+++ b/arch/arm/boot/dts/sama5d3_mci2.dtsi
@@ -9,7 +9,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
ahb {
diff --git a/arch/arm/boot/dts/sama5d3_tcb1.dtsi
b/arch/arm/boot/dts/sama5d3_tcb1.dtsi
index 382b044..0284845 100644
--- a/arch/arm/boot/dts/sama5d3_tcb1.dtsi
+++ b/arch/arm/boot/dts/sama5d3_tcb1.dtsi
@@ -9,7 +9,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
aliases {
diff --git a/arch/arm/boot/dts/sama5d3_uart.dtsi
b/arch/arm/boot/dts/sama5d3_uart.dtsi
index a9fa75e..7a8d4c6 100644
--- a/arch/arm/boot/dts/sama5d3_uart.dtsi
+++ b/arch/arm/boot/dts/sama5d3_uart.dtsi
@@ -9,7 +9,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
aliases {
diff --git a/include/dt-bindings/clk/at91.h b/include/dt-bindings/clock/at91.h
similarity index 100%
rename from include/dt-bindings/clk/at91.h
rename to include/dt-bindings/clock/at91.h
--
Nicolas Ferre
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] dt-bindings: clock: Move at91.h to dt-bindigs/clock
On 06/03/2014 07:04, Tushar Behera :
Most of the clock related dt-binding header files are located in
dt-bindings/clock folder. It would be good to keep all the similar
header files at a single location.
Signed-off-by: Tushar Behera tushar.beh...@linaro.org
CC: Rob Landley r...@landley.net
CC: Andrew Victor li...@maxim.org.za
CC: Jean-Christophe Plagniol-Villard plagn...@jcrosoft.com
Acked-by: Nicolas Ferre nicolas.fe...@atmel.com
---
.../devicetree/bindings/clock/at91-clock.txt |2 +-
arch/arm/boot/dts/sama5d3.dtsi |2 +-
arch/arm/boot/dts/sama5d3_mci2.dtsi|2 +-
arch/arm/boot/dts/sama5d3_tcb1.dtsi|2 +-
arch/arm/boot/dts/sama5d3_uart.dtsi|2 +-
include/dt-bindings/{clk = clock}/at91.h |0
6 files changed, 5 insertions(+), 5 deletions(-)
rename include/dt-bindings/{clk = clock}/at91.h (100%)
diff --git a/Documentation/devicetree/bindings/clock/at91-clock.txt
b/Documentation/devicetree/bindings/clock/at91-clock.txt
index cd5e239..6794cdc 100644
--- a/Documentation/devicetree/bindings/clock/at91-clock.txt
+++ b/Documentation/devicetree/bindings/clock/at91-clock.txt
@@ -62,7 +62,7 @@ Required properties for PMC node:
- interrupt-controller : tell that the PMC is an interrupt controller.
- #interrupt-cells : must be set to 1. The first cell encodes the interrupt
id,
and reflect the bit position in the PMC_ER/DR/SR registers.
- You can use the dt macros defined in dt-bindings/clk/at91.h.
+ You can use the dt macros defined in dt-bindings/clock/at91.h.
0 (AT91_PMC_MOSCS) - main oscillator ready
1 (AT91_PMC_LOCKA) - PLL A ready
2 (AT91_PMC_LOCKB) - PLL B ready
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 3d5faf8..8c977b5 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -13,7 +13,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
#include dt-bindings/gpio/gpio.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
model = Atmel SAMA5D3 family SoC;
diff --git a/arch/arm/boot/dts/sama5d3_mci2.dtsi
b/arch/arm/boot/dts/sama5d3_mci2.dtsi
index b029fe7..1b02208 100644
--- a/arch/arm/boot/dts/sama5d3_mci2.dtsi
+++ b/arch/arm/boot/dts/sama5d3_mci2.dtsi
@@ -9,7 +9,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
ahb {
diff --git a/arch/arm/boot/dts/sama5d3_tcb1.dtsi
b/arch/arm/boot/dts/sama5d3_tcb1.dtsi
index 382b044..0284845 100644
--- a/arch/arm/boot/dts/sama5d3_tcb1.dtsi
+++ b/arch/arm/boot/dts/sama5d3_tcb1.dtsi
@@ -9,7 +9,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
aliases {
diff --git a/arch/arm/boot/dts/sama5d3_uart.dtsi
b/arch/arm/boot/dts/sama5d3_uart.dtsi
index a9fa75e..7a8d4c6 100644
--- a/arch/arm/boot/dts/sama5d3_uart.dtsi
+++ b/arch/arm/boot/dts/sama5d3_uart.dtsi
@@ -9,7 +9,7 @@
#include dt-bindings/pinctrl/at91.h
#include dt-bindings/interrupt-controller/irq.h
-#include dt-bindings/clk/at91.h
+#include dt-bindings/clock/at91.h
/ {
aliases {
diff --git a/include/dt-bindings/clk/at91.h b/include/dt-bindings/clock/at91.h
similarity index 100%
rename from include/dt-bindings/clk/at91.h
rename to include/dt-bindings/clock/at91.h
--
Nicolas Ferre
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 36/51] DMA-API: usb: use dma_set_coherent_mask()
On 20/09/2013 00:01, Russell King :
The correct way for a driver to specify the coherent DMA mask is
not to directly access the field in the struct device, but to use
dma_set_coherent_mask(). Only arch and bus code should access this
member directly.
Convert all direct write accesses to using the correct API.
Signed-off-by: Russell King rmk+ker...@arm.linux.org.uk
---
drivers/usb/chipidea/ci_hdrc_imx.c |5 +++--
drivers/usb/dwc3/dwc3-exynos.c |5 +++--
drivers/usb/gadget/lpc32xx_udc.c |4 +++-
drivers/usb/host/ehci-atmel.c |5 +++--
For Atmel driver:
Acked-by: Nicolas Ferre nicolas.fe...@atmel.com
[..]
diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c
index 3b645ff..5831a88 100644
--- a/drivers/usb/host/ehci-atmel.c
+++ b/drivers/usb/host/ehci-atmel.c
@@ -92,8 +92,9 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev)
*/
if (!pdev-dev.dma_mask)
pdev-dev.dma_mask = pdev-dev.coherent_dma_mask;
- if (!pdev-dev.coherent_dma_mask)
- pdev-dev.coherent_dma_mask = DMA_BIT_MASK(32);
+ retval = dma_set_coherent_mask(pdev-dev, DMA_BIT_MASK(32));
+ if (retval)
+ goto fail_create_hcd;
hcd = usb_create_hcd(driver, pdev-dev, dev_name(pdev-dev));
if (!hcd) {
[..]
Thanks,
--
Nicolas Ferre
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 37/51] DMA-API: usb: use new dma_coerce_mask_and_coherent()
On 20/09/2013 00:02, Russell King : Signed-off-by: Russell King rmk+ker...@arm.linux.org.uk --- drivers/usb/chipidea/ci_hdrc_imx.c |4 +--- drivers/usb/dwc3/dwc3-exynos.c |4 +--- drivers/usb/host/ehci-atmel.c |4 +--- For Atmel driver: Acked-by: Nicolas Ferre nicolas.fe...@atmel.com [..] diff --git a/drivers/usb/host/ehci-atmel.c b/drivers/usb/host/ehci-atmel.c index 5831a88..8e7323e 100644 --- a/drivers/usb/host/ehci-atmel.c +++ b/drivers/usb/host/ehci-atmel.c @@ -90,9 +90,7 @@ static int ehci_atmel_drv_probe(struct platform_device *pdev) * Since shared usb code relies on it, set it here for now. * Once we have dma capability bindings this can go away. */ - if (!pdev-dev.dma_mask) - pdev-dev.dma_mask = pdev-dev.coherent_dma_mask; - retval = dma_set_coherent_mask(pdev-dev, DMA_BIT_MASK(32)); + retval = dma_coerce_mask_and_coherent(pdev-dev, DMA_BIT_MASK(32)); if (retval) goto fail_create_hcd; [..] Thanks Russell, -- Nicolas Ferre -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 119/493] usb: remove use of __devexit_p
On 11/19/2012 07:21 PM, Bill Pemberton :
CONFIG_HOTPLUG is going away as an option so __devexit_p is no longer
needed.
Signed-off-by: Bill Pemberton wf...@virginia.edu
Cc: Peter Korsgaard jac...@sunsite.dk
Cc: Alexander Shishkin alexander.shish...@linux.intel.com
Cc: Felipe Balbi ba...@ti.com
Cc: Li Yang le...@freescale.com
Cc: Alan Stern st...@rowland.harvard.edu
Cc: Wan ZongShun mcuos@gmail.com
Cc: Ben Dooks ben-li...@fluff.org
Cc: Kukjin Kim kgene@samsung.com
Cc: linux-...@vger.kernel.org
Cc: linux-o...@vger.kernel.org
Cc: linuxppc-...@lists.ozlabs.org
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org
[..]
drivers/usb/host/ehci-atmel.c| 2 +-
drivers/usb/host/ohci-at91.c | 2 +-
For Atmel:
Acked-by: Nicolas Ferre nicolas.fe...@atmel.com
[..]
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c
index 6f3b6e2..855d538 100644
--- a/drivers/usb/c67x00/c67x00-drv.c
+++ b/drivers/usb/c67x00/c67x00-drv.c
@@ -219,7 +219,7 @@ static int __devexit c67x00_drv_remove(struct
platform_device *pdev)
static struct platform_driver c67x00_driver = {
.probe = c67x00_drv_probe,
- .remove = __devexit_p(c67x00_drv_remove),
+ .remove = c67x00_drv_remove,
.driver = {
.owner = THIS_MODULE,
.name = c67x00,
diff --git a/drivers/usb/chipidea/ci13xxx_imx.c
b/drivers/usb/chipidea/ci13xxx_imx.c
index 0f5ca4b..5659730 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.c
+++ b/drivers/usb/chipidea/ci13xxx_imx.c
@@ -252,7 +252,7 @@ MODULE_DEVICE_TABLE(of, ci13xxx_imx_dt_ids);
static struct platform_driver ci13xxx_imx_driver = {
.probe = ci13xxx_imx_probe,
- .remove = __devexit_p(ci13xxx_imx_remove),
+ .remove = ci13xxx_imx_remove,
.driver = {
.name = imx_usb,
.owner = THIS_MODULE,
diff --git a/drivers/usb/chipidea/ci13xxx_msm.c
b/drivers/usb/chipidea/ci13xxx_msm.c
index b01feb3..406c5af 100644
--- a/drivers/usb/chipidea/ci13xxx_msm.c
+++ b/drivers/usb/chipidea/ci13xxx_msm.c
@@ -89,7 +89,7 @@ static int __devexit ci13xxx_msm_remove(struct
platform_device *pdev)
static struct platform_driver ci13xxx_msm_driver = {
.probe = ci13xxx_msm_probe,
- .remove = __devexit_p(ci13xxx_msm_remove),
+ .remove = ci13xxx_msm_remove,
.driver = { .name = msm_hsusb, },
};
diff --git a/drivers/usb/chipidea/ci13xxx_pci.c
b/drivers/usb/chipidea/ci13xxx_pci.c
index 918e149..e1cb2fb 100644
--- a/drivers/usb/chipidea/ci13xxx_pci.c
+++ b/drivers/usb/chipidea/ci13xxx_pci.c
@@ -147,7 +147,7 @@ static struct pci_driver ci13xxx_pci_driver = {
.name = UDC_DRIVER_NAME,
.id_table = ci13xxx_pci_id_table,
.probe= ci13xxx_pci_probe,
- .remove = __devexit_p(ci13xxx_pci_remove),
+ .remove = ci13xxx_pci_remove,
};
module_pci_driver(ci13xxx_pci_driver);
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index f69d029..46f23f2 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -523,7 +523,7 @@ static int __devexit ci_hdrc_remove(struct
platform_device *pdev)
static struct platform_driver ci_hdrc_driver = {
.probe = ci_hdrc_probe,
- .remove = __devexit_p(ci_hdrc_remove),
+ .remove = ci_hdrc_remove,
.driver = {
.name = ci_hdrc,
},
diff --git a/drivers/usb/chipidea/usbmisc_imx6q.c
b/drivers/usb/chipidea/usbmisc_imx6q.c
index 416e3fc..81238a4 100644
--- a/drivers/usb/chipidea/usbmisc_imx6q.c
+++ b/drivers/usb/chipidea/usbmisc_imx6q.c
@@ -136,7 +136,7 @@ static int __devexit usbmisc_imx6q_remove(struct
platform_device *pdev)
static struct platform_driver usbmisc_imx6q_driver = {
.probe = usbmisc_imx6q_probe,
- .remove = __devexit_p(usbmisc_imx6q_remove),
+ .remove = usbmisc_imx6q_remove,
.driver = {
.name = usbmisc_imx6q,
.owner = THIS_MODULE,
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index e71a62a..1a02442 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -583,7 +583,7 @@ static int __devexit dwc3_remove(struct platform_device
*pdev)
static struct platform_driver dwc3_driver = {
.probe = dwc3_probe,
- .remove = __devexit_p(dwc3_remove),
+ .remove = dwc3_remove,
.driver = {
.name = dwc3,
},
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c
index dc35c54..19a9818 100644
--- a/drivers/usb/dwc3/dwc3-exynos.c
+++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -196,7 +196,7 @@ MODULE_DEVICE_TABLE(of, exynos_dwc3_match);
static struct platform_driver dwc3_exynos_driver = {
.probe = dwc3_exynos_probe,
- .remove = __devexit_p(dwc3_exynos_remove),
+ .remove
Re: IS_ERR_OR_NULL - please STOP telling people to use this on a whim
On 10/17/2012 11:33 PM, Russell King - ARM Linux : On Wed, Oct 17, 2012 at 11:28:48PM +0300, Phil Carmody wrote: So, what to do? It can and has been used sensibly, so I don't think removing it is the best option. Well, the first thing that needs to be done is a full review of every user and fixes applied. The second thing is that we need eyes on code _and_ review comments, and educate those who are telling people to use IS_ERR_OR_NULL() whenever they see an IS_ERR() to think about the code a little more - that's kind of the purpose of my email. Unfortunately, it's going to take time to achieve a change, and if I end up being the only one who's spotting these errors, I'm going to get incredibly pissed off at doing so (because it will feel like I'm being ignored when there's a constant stream of it.) Another thing would be to work out whether we can get checkpatch to detect usage of IS_ERR_OR_NULL(p) followed by PTR_ERR(p) without any explicit NULL checks against p in the same block. That's probably going to be interesting to code up in perl. True that it would make sense to include in checkpatch to be able to block code beforehand. But for sure correction of existing code seems to be a work for Coccinelle. Best regards, -- Nicolas Ferre -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 14/24] USB: ohci: merge ohci_finish_controller_resume with ohci_resume
On 10/04/2012 05:17 PM, Florian Fainelli :
Merge ohci_finish_controller_resume with ohci_resume as suggested by Alan
Stern. Since ohci_finish_controller_resume no longer exists, update the
various OHCI drivers to call ohci_resume() instead. Some drivers used to set
themselves the bit HCD_FLAG_HW_ACCESSIBLE, which is now handled by
ohci_resume().
Signed-off-by: Florian Fainelli flor...@openwrt.org
---
drivers/usb/host/ohci-at91.c |2 +-
Seems ok for AT91, so
Acked-by: Nicolas Ferre nicolas.fe...@atmel.com
Thanks Florian, bye,
drivers/usb/host/ohci-ep93xx.c |2 +-
drivers/usb/host/ohci-exynos.c |5 +
drivers/usb/host/ohci-hcd.c | 41 +++--
drivers/usb/host/ohci-hub.c | 42
--
drivers/usb/host/ohci-omap.c |2 +-
drivers/usb/host/ohci-platform.c |2 +-
drivers/usb/host/ohci-pxa27x.c |2 +-
drivers/usb/host/ohci-s3c2410.c |3 +--
drivers/usb/host/ohci-spear.c|2 +-
drivers/usb/host/ohci-tmio.c |2 +-
11 files changed, 48 insertions(+), 57 deletions(-)
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index 0bf72f9..908d84a 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -705,7 +705,7 @@ static int ohci_hcd_at91_drv_resume(struct
platform_device *pdev)
if (!clocked)
at91_start_clock();
- ohci_finish_controller_resume(hcd);
+ ohci_resume(hcd, false);
return 0;
}
#else
diff --git a/drivers/usb/host/ohci-ep93xx.c b/drivers/usb/host/ohci-ep93xx.c
index dbfbd1d..a982f04 100644
--- a/drivers/usb/host/ohci-ep93xx.c
+++ b/drivers/usb/host/ohci-ep93xx.c
@@ -194,7 +194,7 @@ static int ohci_hcd_ep93xx_drv_resume(struct
platform_device *pdev)
ep93xx_start_hc(pdev-dev);
- ohci_finish_controller_resume(hcd);
+ ohci_resume(hcd, false);
return 0;
}
#endif
diff --git a/drivers/usb/host/ohci-exynos.c b/drivers/usb/host/ohci-exynos.c
index fc3091b..53c5a989 100644
--- a/drivers/usb/host/ohci-exynos.c
+++ b/drivers/usb/host/ohci-exynos.c
@@ -252,10 +252,7 @@ static int exynos_ohci_resume(struct device *dev)
if (pdata pdata-phy_init)
pdata-phy_init(pdev, S5P_USB_PHY_HOST);
- /* Mark hardware accessible again as we are out of D3 state by now */
- set_bit(HCD_FLAG_HW_ACCESSIBLE, hcd-flags);
-
- ohci_finish_controller_resume(hcd);
+ ohci_resume(hcd, false);
return 0;
}
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 5d30992..568bdb3 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -1003,13 +1003,50 @@ static int __maybe_unused ohci_suspend(struct usb_hcd
*hcd, bool do_wakeup)
static int __maybe_unused ohci_resume(struct usb_hcd *hcd, bool hibernated)
{
+ struct ohci_hcd *ohci = hcd_to_ohci(hcd);
+ int port;
+ boolneed_reinit = false;
+
set_bit(HCD_FLAG_HW_ACCESSIBLE, hcd-flags);
/* Make sure resume from hibernation re-enumerates everything */
if (hibernated)
- ohci_usb_reset(hcd_to_ohci(hcd));
+ ohci_usb_reset(ohci);
+
+ /* See if the controller is already running or has been reset */
+ ohci-hc_control = ohci_readl(ohci, ohci-regs-control);
+ if (ohci-hc_control (OHCI_CTRL_IR | OHCI_SCHED_ENABLES)) {
+ need_reinit = true;
+ } else {
+ switch (ohci-hc_control OHCI_CTRL_HCFS) {
+ case OHCI_USB_OPER:
+ case OHCI_USB_RESET:
+ need_reinit = true;
+ }
+ }
+
+ /* If needed, reinitialize and suspend the root hub */
+ if (need_reinit) {
+ spin_lock_irq(ohci-lock);
+ ohci_rh_resume(ohci);
+ ohci_rh_suspend(ohci, 0);
+ spin_unlock_irq(ohci-lock);
+ }
+
+ /* Normally just turn on port power and enable interrupts */
+ else {
+ ohci_dbg(ohci, powerup ports\n);
+ for (port = 0; port ohci-num_ports; port++)
+ ohci_writel(ohci, RH_PS_PPS,
+ ohci-regs-roothub.portstatus[port]);
+
+ ohci_writel(ohci, OHCI_INTR_MIE, ohci-regs-intrenable);
+ ohci_readl(ohci, ohci-regs-intrenable);
+ msleep(20);
+ }
+
+ usb_hcd_resume_root_hub(hcd);
- ohci_finish_controller_resume(hcd);
return 0;
}
diff --git a/drivers/usb/host/ohci-hub.c b/drivers/usb/host/ohci-hub.c
index 2f3619e..db09dae 100644
--- a/drivers/usb/host/ohci-hub.c
+++ b/drivers/usb/host/ohci-hub.c
@@ -316,48 +316,6 @@ static int ohci_bus_resume (struct usb_hcd *hcd)
return rc;
}
-/* Carry out the final steps of resuming the controller device */
-static void __maybe_unused
Re: ARM/ARM-SoC plans for v3.4 merge window
On 02/08/2012 02:18 AM, Olof Johansson : Hi, On Mon, Jan 30, 2012 at 2:08 AM, Nicolas Ferre nicolas.fe...@atmel.com wrote: On 01/29/2012 12:57 AM, Olof Johansson : Hi, On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux li...@arm.linux.org.uk wrote: And we're now there. So... Arnd, Olaf, Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at: git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05. Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo. Any next/ branch we start will have this as the base of said branch, so any vendor branches must either already be developed against this stable branch, or merge on top of this with minimal conflicts. Ok, great. I just let you know that there is a conflict between the current Linus' tree (with recently updated at91 fixes) and this rmk/for-armsoc branch. I can give you the resolution of this conflict easily but I would like to know which way I execute the merge: I use this rmk/for-armsoc as a baseline and merge the fixes already in Linus' tree on top of it or the other way around? Maybe it is preferable that I wait for 3.3-rc2 and merge rmk/for-armsoc on top of it. This result can be the base of our AT91 work for 3.4 preparation. Your thought? I missed replying to this email until now when I started looking at picking up branches for the 3.4 staging, sorry for the delay. Russell, would you prefer merging in v3.3-rc2 into your branch so I can pull the exact same resolution from there, or should we do it locally in arm-soc? It probably makes sense for you to do it so there's no more conflicts from there on out for dependent branches. Olof, For your information the conflict resolution is already present in linux-next (and in my 3.4 preparation branches actually). Best regards, -- Nicolas Ferre -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: ARM/ARM-SoC plans for v3.4 merge window
On 01/29/2012 12:57 AM, Olof Johansson : Hi, On Thu, Jan 26, 2012 at 1:23 PM, Russell King - ARM Linux li...@arm.linux.org.uk wrote: And we're now there. So... Arnd, Olaf, Please incorporate the latest ARM (for-armsoc branch) changes, which can be found at: git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-arm.git for-armsoc with SHA1 dcf81c1af839b77b44404453ecae6e5ac5a75f05. Thanks. I have added this as depends/rmk/for-armsoc in the arm-soc repo. Any next/ branch we start will have this as the base of said branch, so any vendor branches must either already be developed against this stable branch, or merge on top of this with minimal conflicts. Ok, great. I just let you know that there is a conflict between the current Linus' tree (with recently updated at91 fixes) and this rmk/for-armsoc branch. I can give you the resolution of this conflict easily but I would like to know which way I execute the merge: I use this rmk/for-armsoc as a baseline and merge the fixes already in Linus' tree on top of it or the other way around? Maybe it is preferable that I wait for 3.3-rc2 and merge rmk/for-armsoc on top of it. This result can be the base of our AT91 work for 3.4 preparation. Your thought? Best regards, -- Nicolas Ferre -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
