Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 351060
b: refs/heads/master
c: 184cddd
h: refs/heads/master
v: v3
  • Loading branch information
Jonghwan Choi authored and Kukjin Kim committed Dec 23, 2012
1 parent abc1896 commit 9e24671
Show file tree
Hide file tree
Showing 2,719 changed files with 21,489 additions and 35,664 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4419fbd4b408c3a8634b3a8dd952055d0f0b601f
refs/heads/master: 184cddd1e004d3ebd473f9e1ce20dec1d2576fd1
13 changes: 0 additions & 13 deletions trunk/Documentation/ABI/testing/sysfs-devices-power_resources_D0

This file was deleted.

14 changes: 0 additions & 14 deletions trunk/Documentation/ABI/testing/sysfs-devices-power_resources_D1

This file was deleted.

14 changes: 0 additions & 14 deletions trunk/Documentation/ABI/testing/sysfs-devices-power_resources_D2

This file was deleted.

This file was deleted.

20 changes: 0 additions & 20 deletions trunk/Documentation/ABI/testing/sysfs-devices-power_state

This file was deleted.

23 changes: 0 additions & 23 deletions trunk/Documentation/ABI/testing/sysfs-devices-real_power_state

This file was deleted.

12 changes: 0 additions & 12 deletions trunk/Documentation/ABI/testing/sysfs-devices-resource_in_use

This file was deleted.

6 changes: 3 additions & 3 deletions trunk/Documentation/DocBook/media/v4l/driver.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions trunk/Documentation/PCI/pci-iov-howto.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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,
Expand Down
20 changes: 20 additions & 0 deletions trunk/Documentation/PCI/pci.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
6 changes: 3 additions & 3 deletions trunk/Documentation/acpi/enumeration.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ from ACPI tables.
Currently the kernel is not able to automatically determine from which ACPI
device it should make the corresponding platform device so we need to add
the ACPI device explicitly to acpi_platform_device_ids list defined in
drivers/acpi/acpi_platform.c. This limitation is only for the platform
devices, SPI and I2C devices are created automatically as described below.
drivers/acpi/scan.c. This limitation is only for the platform devices, SPI
and I2C devices are created automatically as described below.

SPI serial bus support
~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -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,
};

Expand Down
77 changes: 0 additions & 77 deletions trunk/Documentation/acpi/scan_handlers.txt

This file was deleted.

6 changes: 0 additions & 6 deletions trunk/Documentation/cpu-freq/cpu-drivers.txt
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,6 @@ policy->governor must contain the "default policy" for
For setting some of these values, the frequency table helpers might be
helpful. See the section 2 for more information on them.

SMP systems normally have same clock source for a group of cpus. For these the
.init() would be called only once for the first online cpu. Here the .init()
routine must initialize policy->cpus with mask of all possible cpus (Online +
Offline) that share the clock. Then the core would copy this mask onto
policy->related_cpus and will reset policy->cpus to carry only online cpus.


1.3 verify
------------
Expand Down
8 changes: 4 additions & 4 deletions trunk/Documentation/cpu-freq/user-guide.txt
Original file line number Diff line number Diff line change
Expand Up @@ -190,11 +190,11 @@ scaling_max_freq show the current "policy limits" (in
first set scaling_max_freq, then
scaling_min_freq.

affected_cpus : List of Online CPUs that require software
coordination of frequency.
affected_cpus : List of CPUs that require software coordination
of frequency.

related_cpus : List of Online + Offline CPUs that need software
coordination of frequency.
related_cpus : List of CPUs that need some sort of frequency
coordination, whether software or hardware.

scaling_driver : Hardware driver for cpufreq.

Expand Down
1 change: 0 additions & 1 deletion trunk/Documentation/device-mapper/dm-raid.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
27 changes: 0 additions & 27 deletions trunk/Documentation/devicetree/bindings/arm/kirkwood.txt

This file was deleted.

5 changes: 5 additions & 0 deletions trunk/Documentation/devicetree/bindings/clock/imx23-clock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions trunk/Documentation/devicetree/bindings/clock/imx25-clock.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit 9e24671

Please sign in to comment.