diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/driver-api/driver-model/binding.rst (renamed from Documentation/driver-model/binding.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/bus.rst (renamed from Documentation/driver-model/bus.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/class.rst (renamed from Documentation/driver-model/class.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/design-patterns.rst (renamed from Documentation/driver-model/design-patterns.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/device.rst (renamed from Documentation/driver-model/device.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/devres.rst (renamed from Documentation/driver-model/devres.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/driver.rst (renamed from Documentation/driver-model/driver.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/index.rst (renamed from Documentation/driver-model/index.rst) | 2 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/overview.rst (renamed from Documentation/driver-model/overview.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/platform.rst (renamed from Documentation/driver-model/platform.rst) | 0 | ||||
-rw-r--r-- | Documentation/driver-api/driver-model/porting.rst (renamed from Documentation/driver-model/porting.rst) | 2 | ||||
-rw-r--r-- | Documentation/driver-api/gpio/driver.rst | 2 | ||||
-rw-r--r-- | Documentation/driver-api/index.rst | 1 | ||||
-rw-r--r-- | Documentation/eisa.txt | 4 | ||||
-rw-r--r-- | Documentation/filesystems/sysfs.txt | 2 | ||||
-rw-r--r-- | Documentation/hwmon/submitting-patches.rst | 2 | ||||
-rw-r--r-- | Documentation/translations/zh_CN/filesystems/sysfs.txt | 2 |
17 files changed, 8 insertions, 9 deletions
diff --git a/Documentation/driver-model/binding.rst b/Documentation/driver-api/driver-model/binding.rst index 7ea1d7a41e1d..7ea1d7a41e1d 100644 --- a/Documentation/driver-model/binding.rst +++ b/Documentation/driver-api/driver-model/binding.rst diff --git a/Documentation/driver-model/bus.rst b/Documentation/driver-api/driver-model/bus.rst index 016b15a6e8ea..016b15a6e8ea 100644 --- a/Documentation/driver-model/bus.rst +++ b/Documentation/driver-api/driver-model/bus.rst diff --git a/Documentation/driver-model/class.rst b/Documentation/driver-api/driver-model/class.rst index fff55b80e86a..fff55b80e86a 100644 --- a/Documentation/driver-model/class.rst +++ b/Documentation/driver-api/driver-model/class.rst diff --git a/Documentation/driver-model/design-patterns.rst b/Documentation/driver-api/driver-model/design-patterns.rst index 41eb8f41f7dd..41eb8f41f7dd 100644 --- a/Documentation/driver-model/design-patterns.rst +++ b/Documentation/driver-api/driver-model/design-patterns.rst diff --git a/Documentation/driver-model/device.rst b/Documentation/driver-api/driver-model/device.rst index 2b868d49d349..2b868d49d349 100644 --- a/Documentation/driver-model/device.rst +++ b/Documentation/driver-api/driver-model/device.rst diff --git a/Documentation/driver-model/devres.rst b/Documentation/driver-api/driver-model/devres.rst index 4ac99122b5f1..4ac99122b5f1 100644 --- a/Documentation/driver-model/devres.rst +++ b/Documentation/driver-api/driver-model/devres.rst diff --git a/Documentation/driver-model/driver.rst b/Documentation/driver-api/driver-model/driver.rst index 11d281506a04..11d281506a04 100644 --- a/Documentation/driver-model/driver.rst +++ b/Documentation/driver-api/driver-model/driver.rst diff --git a/Documentation/driver-model/index.rst b/Documentation/driver-api/driver-model/index.rst index 9f85d579ce56..755016422269 100644 --- a/Documentation/driver-model/index.rst +++ b/Documentation/driver-api/driver-model/index.rst @@ -1,5 +1,3 @@ -:orphan: - ============ Driver Model ============ diff --git a/Documentation/driver-model/overview.rst b/Documentation/driver-api/driver-model/overview.rst index d4d1e9b40e0c..d4d1e9b40e0c 100644 --- a/Documentation/driver-model/overview.rst +++ b/Documentation/driver-api/driver-model/overview.rst diff --git a/Documentation/driver-model/platform.rst b/Documentation/driver-api/driver-model/platform.rst index 334dd4071ae4..334dd4071ae4 100644 --- a/Documentation/driver-model/platform.rst +++ b/Documentation/driver-api/driver-model/platform.rst diff --git a/Documentation/driver-model/porting.rst b/Documentation/driver-api/driver-model/porting.rst index ae4bf843c1d6..931ea879af3f 100644 --- a/Documentation/driver-model/porting.rst +++ b/Documentation/driver-api/driver-model/porting.rst @@ -9,7 +9,7 @@ Patrick Mochel Overview -Please refer to `Documentation/driver-model/*.rst` for definitions of +Please refer to `Documentation/driver-api/driver-model/*.rst` for definitions of various driver types and concepts. Most of the work of porting devices drivers to the new model happens diff --git a/Documentation/driver-api/gpio/driver.rst b/Documentation/driver-api/gpio/driver.rst index 349f2dc33029..921c71a3d683 100644 --- a/Documentation/driver-api/gpio/driver.rst +++ b/Documentation/driver-api/gpio/driver.rst @@ -399,7 +399,7 @@ symbol: will pass the struct gpio_chip* for the chip to all IRQ callbacks, so the callbacks need to embed the gpio_chip in its state container and obtain a pointer to the container using container_of(). - (See Documentation/driver-model/design-patterns.rst) + (See Documentation/driver-api/driver-model/design-patterns.rst) - gpiochip_irqchip_add_nested(): adds a nested cascaded irqchip to a gpiochip, as discussed above regarding different types of cascaded irqchips. The diff --git a/Documentation/driver-api/index.rst b/Documentation/driver-api/index.rst index b4c993ff7655..9fb03b7bdeb1 100644 --- a/Documentation/driver-api/index.rst +++ b/Documentation/driver-api/index.rst @@ -14,6 +14,7 @@ available subsections can be seen below. .. toctree:: :maxdepth: 2 + driver-model/index basics infrastructure early-userspace/index diff --git a/Documentation/eisa.txt b/Documentation/eisa.txt index f388545a85a7..c07565ba57da 100644 --- a/Documentation/eisa.txt +++ b/Documentation/eisa.txt @@ -103,7 +103,7 @@ id_table an array of NULL terminated EISA id strings, (driver_data). driver a generic driver, such as described in - Documentation/driver-model/driver.rst. Only .name, + Documentation/driver-api/driver-model/driver.rst. Only .name, .probe and .remove members are mandatory. =============== ==================================================== @@ -152,7 +152,7 @@ state set of flags indicating the state of the device. Current flags are EISA_CONFIG_ENABLED and EISA_CONFIG_FORCED. res set of four 256 bytes I/O regions allocated to this device dma_mask DMA mask set from the parent device. -dev generic device (see Documentation/driver-model/device.rst) +dev generic device (see Documentation/driver-api/driver-model/device.rst) ======== ============================================================ You can get the 'struct eisa_device' from 'struct device' using the diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt index 5b5311f9358d..ddf15b1b0d5a 100644 --- a/Documentation/filesystems/sysfs.txt +++ b/Documentation/filesystems/sysfs.txt @@ -319,7 +319,7 @@ quick way to lookup the sysfs interface for a device from the result of a stat(2) operation. More information can driver-model specific features can be found in -Documentation/driver-model/. +Documentation/driver-api/driver-model/. TODO: Finish this section. diff --git a/Documentation/hwmon/submitting-patches.rst b/Documentation/hwmon/submitting-patches.rst index d5b05d3e54ba..452fc28d8e0b 100644 --- a/Documentation/hwmon/submitting-patches.rst +++ b/Documentation/hwmon/submitting-patches.rst @@ -89,7 +89,7 @@ increase the chances of your change being accepted. console. Excessive logging can seriously affect system performance. * Use devres functions whenever possible to allocate resources. For rationale - and supported functions, please see Documentation/driver-model/devres.rst. + and supported functions, please see Documentation/driver-api/driver-model/devres.rst. If a function is not supported by devres, consider using devm_add_action(). * If the driver has a detect function, make sure it is silent. Debug messages diff --git a/Documentation/translations/zh_CN/filesystems/sysfs.txt b/Documentation/translations/zh_CN/filesystems/sysfs.txt index 452271dda141..ee1f37da5b23 100644 --- a/Documentation/translations/zh_CN/filesystems/sysfs.txt +++ b/Documentation/translations/zh_CN/filesystems/sysfs.txt @@ -288,7 +288,7 @@ dev/ 包含两个子目录: char/ 和 block/。在这两个子目录中,有 中相应的设备。/sys/dev 提供一个通过一个 stat(2) 操作结果,查找 设备 sysfs 接口快捷的方法。 -更多有关 driver-model 的特性信息可以在 Documentation/driver-model/ +更多有关 driver-model 的特性信息可以在 Documentation/driver-api/driver-model/ 中找到。 |