---

yaml --- r: 355791 b: refs/heads/master c: a9d281c h: refs/heads/master i: 355789: f0b9ed3 355787: 253bb02 355783: 75f773b 355775: 1adf1e2 v: v3
git-mirror · Jan 8, 2013 · aa0207a · aa0207a
1 parent 070b936
commit aa0207a
Show file tree

Hide file tree

Showing 2,884 changed files with 25,660 additions and 36,725 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dd8b5c8dac143f2898def5bd49b651c81fad776b
+refs/heads/master: a9d281cab72cbb45fcde8be3e20b7494f573ac9d
diff --git a/trunk/Documentation/DocBook/media/v4l/driver.xml b/trunk/Documentation/DocBook/media/v4l/driver.xml
@@ -116,15 +116,15 @@ my_suspend              (struct pci_dev *               pci_dev,
 	return 0; /* a negative value on error, 0 on success. */
 }
 
-static void
+static void __devexit
 my_remove               (struct pci_dev *               pci_dev)
 {
 	my_device *my = pci_get_drvdata (pci_dev);
 
 	/* Describe me. */
 }
 
-static int
+static int __devinit
 my_probe                (struct pci_dev *               pci_dev,
 			 const struct pci_device_id *   pci_id)
 {
@@ -157,7 +157,7 @@ my_pci_driver = {
 	.id_table = my_pci_device_ids,
 
 	.probe    = my_probe,
-	.remove   = my_remove,
+	.remove   = __devexit_p (my_remove),
 
 	/* Power management functions. */
 	.suspend  = my_suspend,

diff --git a/trunk/Documentation/PCI/pci-iov-howto.txt b/trunk/Documentation/PCI/pci-iov-howto.txt
@@ -76,7 +76,7 @@ To notify SR-IOV core of Virtual Function Migration:
 
 Following piece of code illustrates the usage of the SR-IOV API.
 
-static int dev_probe(struct pci_dev *dev, const struct pci_device_id *id)
+static int __devinit dev_probe(struct pci_dev *dev, const struct pci_device_id *id)
 {
 	pci_enable_sriov(dev, NR_VIRTFN);
 
@@ -85,7 +85,7 @@ static int dev_probe(struct pci_dev *dev, const struct pci_device_id *id)
 	return 0;
 }
 
-static void dev_remove(struct pci_dev *dev)
+static void __devexit dev_remove(struct pci_dev *dev)
 {
 	pci_disable_sriov(dev);
 
@@ -131,7 +131,7 @@ static struct pci_driver dev_driver = {
 	.name =		"SR-IOV Physical Function driver",
 	.id_table =	dev_id_table,
 	.probe =	dev_probe,
-	.remove =	dev_remove,
+	.remove =	__devexit_p(dev_remove),
 	.suspend =	dev_suspend,
 	.resume =	dev_resume,
 	.shutdown =	dev_shutdown,

diff --git a/trunk/Documentation/PCI/pci.txt b/trunk/Documentation/PCI/pci.txt
@@ -183,13 +183,33 @@ Please mark the initialization and cleanup functions where appropriate
 			initializes.
 	__exit		Exit code. Ignored for non-modular drivers.
 
+
+	__devinit	Device initialization code.
+			Identical to __init if the kernel is not compiled
+			with CONFIG_HOTPLUG, normal function otherwise.
+	__devexit	The same for __exit.
+
 Tips on when/where to use the above attributes:
 	o The module_init()/module_exit() functions (and all
 	  initialization functions called _only_ from these)
 	  should be marked __init/__exit.
 
 	o Do not mark the struct pci_driver.
 
+	o The ID table array should be marked __devinitconst; this is done
+	  automatically if the table is declared with DEFINE_PCI_DEVICE_TABLE().
+
+	o The probe() and remove() functions should be marked __devinit
+	  and __devexit respectively.  All initialization functions
+	  exclusively called by the probe() routine, can be marked __devinit.
+	  Ditto for remove() and __devexit.
+
+	o If mydriver_remove() is marked with __devexit(), then all address
+	  references to mydriver_remove must use __devexit_p(mydriver_remove)
+	  (in the struct pci_driver declaration for example).
+	  __devexit_p() will generate the function name _or_ NULL if the
+	  function will be discarded.  For an example, see drivers/net/tg3.c.
+
 	o Do NOT mark a function if you are not sure which mark to use.
 	  Better to not mark the function than mark the function wrong.
 

diff --git a/trunk/Documentation/acpi/enumeration.txt b/trunk/Documentation/acpi/enumeration.txt
@@ -185,7 +185,7 @@ input driver:
 			.acpi_match_table  ACPI_PTR(mpu3050_acpi_match),
 		},
 		.probe		= mpu3050_probe,
-		.remove		= mpu3050_remove,
+		.remove		= __devexit_p(mpu3050_remove),
 		.id_table	= mpu3050_ids,
 	};
 

diff --git a/trunk/Documentation/device-mapper/dm-raid.txt b/trunk/Documentation/device-mapper/dm-raid.txt
@@ -141,4 +141,3 @@ Version History
 1.2.0	Handle creation of arrays that contain failed devices.
 1.3.0	Added support for RAID 10
 1.3.1	Allow device replacement/rebuild for RAID 10
-1.3.2   Fix/improve redundancy checking for RAID10
diff --git a/trunk/Documentation/devicetree/bindings/arm/sirf.txt b/trunk/Documentation/devicetree/bindings/arm/sirf.txt
@@ -1,9 +1,3 @@
-CSR SiRFprimaII and SiRFmarco device tree bindings.
-========================================
-
+prima2 "cb" evaluation board
 Required root node properties:
-    - compatible:
-    - "sirf,prima2-cb" : prima2 "cb" evaluation board
-    - "sirf,marco-cb" : marco "cb" evaluation board
-    - "sirf,prima2" : prima2 device based board
-    - "sirf,marco" : marco device based board
+    - compatible = "sirf,prima2-cb", "sirf,prima2";
diff --git a/trunk/Documentation/devicetree/bindings/arm/ste-nomadik.txt b/trunk/Documentation/devicetree/bindings/arm/ste-nomadik.txt
diff --git a/trunk/Documentation/devicetree/bindings/arm/tegra.txt b/trunk/Documentation/devicetree/bindings/arm/tegra.txt
@@ -1,34 +1,14 @@
 NVIDIA Tegra device tree bindings
 -------------------------------------------
 
-SoCs
--------------------------------------------
+Boards with the tegra20 SoC shall have the following properties:
 
-Each device tree must specify which Tegra SoC it uses, using one of the
-following compatible values:
+Required root node property:
 
-  nvidia,tegra20
-  nvidia,tegra30
+compatible = "nvidia,tegra20";
 
-Boards
--------------------------------------------
+Boards with the tegra30 SoC shall have the following properties:
 
-Each device tree must specify which one or more of the following
-board-specific compatible values:
+Required root node property:
 
-  ad,medcom-wide
-  ad,plutux
-  ad,tamonten
-  ad,tec
-  compal,paz00
-  compulab,trimslice
-  nvidia,beaver
-  nvidia,cardhu
-  nvidia,cardhu-a02
-  nvidia,cardhu-a04
-  nvidia,harmony
-  nvidia,seaboard
-  nvidia,ventana
-  nvidia,whistler
-  toradex,colibri_t20-512
-  toradex,iris
+compatible = "nvidia,tegra30";
diff --git a/trunk/Documentation/devicetree/bindings/arm/vt8500.txt b/trunk/Documentation/devicetree/bindings/arm/vt8500.txt
@@ -12,11 +12,3 @@ compatible = "wm,wm8505";
 Boards with the Wondermedia WM8650 SoC shall have the following properties:
 Required root node property:
 compatible = "wm,wm8650";
-
-Boards with the Wondermedia WM8750 SoC shall have the following properties:
-Required root node property:
-compatible = "wm,wm8750";
-
-Boards with the Wondermedia WM8850 SoC shall have the following properties:
-Required root node property:
-compatible = "wm,wm8850";
diff --git a/trunk/Documentation/devicetree/bindings/clock/imx23-clock.txt b/trunk/Documentation/devicetree/bindings/clock/imx23-clock.txt
@@ -60,6 +60,11 @@ clks: clkctrl@80040000 {
 	compatible = "fsl,imx23-clkctrl";
 	reg = <0x80040000 0x2000>;
 	#clock-cells = <1>;
+	clock-output-names =
+		...
+		"uart",		/* 32 */
+		...
+		"end_of_list";
 };
 
 auart0: serial@8006c000 {

diff --git a/trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt b/trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt
@@ -146,6 +146,10 @@ clks: ccm@53f80000 {
 	compatible = "fsl,imx25-ccm";
 	reg = <0x53f80000 0x4000>;
 	interrupts = <31>;
+	clock-output-names = ...
+			"uart_ipg",
+			"uart_serial",
+			...;
 };
 
 uart1: serial@43f90000 {

diff --git a/trunk/Documentation/devicetree/bindings/clock/imx28-clock.txt b/trunk/Documentation/devicetree/bindings/clock/imx28-clock.txt
@@ -83,6 +83,11 @@ clks: clkctrl@80040000 {
 	compatible = "fsl,imx28-clkctrl";
 	reg = <0x80040000 0x2000>;
 	#clock-cells = <1>;
+	clock-output-names =
+		...
+		"uart",		/* 45 */
+		...
+		"end_of_list";
 };
 
 auart0: serial@8006a000 {

diff --git a/trunk/Documentation/devicetree/bindings/clock/imx31-clock.txt b/trunk/Documentation/devicetree/bindings/clock/imx31-clock.txt
diff --git a/trunk/Documentation/devicetree/bindings/clock/imx6q-clock.txt b/trunk/Documentation/devicetree/bindings/clock/imx6q-clock.txt
@@ -211,6 +211,10 @@ clks: ccm@020c4000 {
 	reg = <0x020c4000 0x4000>;
 	interrupts = <0 87 0x04 0 88 0x04>;
 	#clock-cells = <1>;
+	clock-output-names = ...
+			     "uart_ipg",
+			     "uart_serial",
+			     ...;
 };
 
 uart1: serial@02020000 {