Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 351597
b: refs/heads/master
c: bb65a9c
h: refs/heads/master
i:
  351595: 9264dd8
v: v3
  • Loading branch information
Li RongQing authored and Steffen Klassert committed Jan 7, 2013
1 parent a2496e0 commit 204797f
Show file tree
Hide file tree
Showing 2,186 changed files with 45,274 additions and 31,835 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4c133c39ae1bc541b3db5903a680da738a0c57e3
refs/heads/master: bb65a9cb953fdfe9c507e8dbb6c4ec2540484bd3
6 changes: 3 additions & 3 deletions trunk/Documentation/DocBook/media/v4l/driver.xml
View file
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
View file
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
View file
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
2 changes: 1 addition & 1 deletion trunk/Documentation/acpi/enumeration.txt
View file
Original file line number Diff line number Diff line change
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
5 changes: 5 additions & 0 deletions trunk/Documentation/devicetree/bindings/clock/imx23-clock.txt
View file
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
View file
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
5 changes: 5 additions & 0 deletions trunk/Documentation/devicetree/bindings/clock/imx28-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions trunk/Documentation/devicetree/bindings/clock/imx6q-clock.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
20 changes: 3 additions & 17 deletions trunk/Documentation/devicetree/bindings/gpio/gpio-poweroff.txt
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,4 @@
Driver a GPIO line that can be used to turn the power off.

The driver supports both level triggered and edge triggered power off.
At driver load time, the driver will request the given gpio line and
install a pm_power_off handler. If the optional properties 'input' is
not found, the GPIO line will be driven in the inactive
state. Otherwise its configured as an input.

When the pm_power_off is called, the gpio is configured as an output,
and drive active, so triggering a level triggered power off
condition. This will also cause an inactive->active edge condition, so
triggering positive edge triggered power off. After a delay of 100ms,
the GPIO is set to inactive, thus causing an active->inactive edge,
triggering negative edge triggered power off. After another 100ms
delay the GPIO is driver active again. If the power is still on and
the CPU still running after a 3000ms delay, a WARN_ON(1) is emitted.
GPIO line that should be set high/low to power off a device

Required properties:
- compatible : should be "gpio-poweroff".
Expand All @@ -28,9 +13,10 @@ Optional properties:
property is not specified, the GPIO is initialized as an output in its
inactive state.


Examples:

gpio-poweroff {
compatible = "gpio-poweroff";
gpios = <&gpio 4 0>;
gpios = <&gpio 4 0>; /* GPIO 4 Active Low */
};
47 changes: 0 additions & 47 deletions trunk/Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt
View file

This file was deleted.

10 changes: 0 additions & 10 deletions trunk/Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion trunk/Documentation/i2c/instantiating-devices
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ Example (from the nxp OHCI driver):

static const unsigned short normal_i2c[] = { 0x2c, 0x2d, I2C_CLIENT_END };

static int usb_hcd_nxp_probe(struct platform_device *pdev)
static int __devinit usb_hcd_nxp_probe(struct platform_device *pdev)
{
(...)
struct i2c_adapter *i2c_adap;
Expand Down
6 changes: 6 additions & 0 deletions trunk/Documentation/networking/00-INDEX
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ de4x5.txt
- the Digital EtherWORKS DE4?? and DE5?? PCI Ethernet driver
decnet.txt
- info on using the DECnet networking layer in Linux.
depca.txt
- the Digital DEPCA/EtherWORKS DE1?? and DE2?? LANCE Ethernet driver
dl2k.txt
- README for D-Link DL2000-based Gigabit Ethernet Adapters (dl2k.ko).
dm9000.txt
Expand All @@ -70,6 +72,8 @@ e1000e.txt
- README for the Intel Gigabit Ethernet Driver (e1000e).
eql.txt
- serial IP load balancing
ewrk3.txt
- the Digital EtherWORKS 3 DE203/4/5 Ethernet driver
fib_trie.txt
- Level Compressed Trie (LC-trie) notes: a structure for routing.
filter.txt
Expand Down Expand Up @@ -122,6 +126,8 @@ ltpc.txt
- the Apple or Farallon LocalTalk PC card driver
mac80211-injection.txt
- HOWTO use packet injection with mac80211
multicast.txt
- Behaviour of cards under Multicast
multiqueue.txt
- HOWTO for multiqueue network device support.
netconsole.txt
Expand Down
Loading

0 comments on commit 204797f

Please sign in to comment.