driver core patches for .37-rc4
Subsystems (3)
PATCH 1/1 driver core patches for .37-rc4
Here are some minor patches for the driver core for .37-rc4
Just minor documentation changes, no code changed anywhere.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/ driver-core-linus
All of these patches have been in the linux-next and mm trees for a while now.
The patches will be sent as a follow-on to this message to lkml for people to see.
thanks,
greg k-h
------------
Documentation/driver-model/interface.txt | 129 ------------------------------ MAINTAINERS | 2 +- drivers/uio/uio.c | 2 +- drivers/uio/uio_cif.c | 2 +- drivers/uio/uio_netx.c | 2 +- include/linux/cpu.h | 5 - include/linux/node.h | 5 - include/linux/uio_driver.h | 2 +- 8 files changed, 5 insertions(+), 144 deletions(-) delete mode 100644 Documentation/driver-model/interface.txt
---------------
Brandon Philips (1):
driver core: prune docs about device_interface
Greg Kroah-Hartman (1):
driver core: the development tree has switched to git
Hans J. Koch (1):
uio: Change mail address of Hans J. Koch
PATCH 1/3 driver core: the development tree has switched to git
So change the MAINTAINERS file to show where the tree now is at.
--- MAINTAINERS | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
MAINTAINERS +1 -1
@@ -2051,7 +2051,7 @@ F: Documentation/blockdev/drbd/ DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS M: Greg Kroah-Hartman <[email protected]> -T: quilt kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git S: Supported F: Documentation/kobject.txt F: drivers/base/
Signature · 1 line
1.7.1
PATCH 3/3 uio: Change mail address of Hans J. Koch
In reply to Greg KHFrom: Hans J. Koch <[email protected]>
My old mail address doesn't exist anymore. This changes all occurrences to my new address.
--- drivers/uio/uio.c | 2 +- drivers/uio/uio_cif.c | 2 +- drivers/uio/uio_netx.c | 2 +- include/linux/uio_driver.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
drivers/uio/uio.c +1 -1
@@ -3,7 +3,7 @@* * Copyright(C) 2005, Benedikt Spranger <[email protected]> * Copyright(C) 2005, Thomas Gleixner <[email protected]> -* Copyright(C) 2006, Hans J. Koch <[email protected]> +* Copyright(C) 2006, Hans J. Koch <[email protected]> * Copyright(C) 2006, Greg Kroah-Hartman <[email protected]> * * Userspace IO
drivers/uio/uio_cif.c +1 -1
@@ -1,7 +1,7 @@/* * UIO Hilscher CIF card driver * -* (C) 2007 Hans J. Koch <[email protected]> +* (C) 2007 Hans J. Koch <[email protected]> * Original code (C) 2005 Benedikt Spranger <[email protected]> * * Licensed under GPL version 2 only.
drivers/uio/uio_netx.c +1 -1
@@ -2,7 +2,7 @@* UIO driver for Hilscher NetX based fieldbus cards (cifX, comX). * See http://www.hilscher.com for details. * -* (C) 2007 Hans J. Koch <[email protected]> +* (C) 2007 Hans J. Koch <[email protected]> * (C) 2008 Manuel Traut <[email protected]> * * Licensed under GPL version 2 only.
include/linux/uio_driver.h +1 -1
@@ -3,7 +3,7 @@* * Copyright(C) 2005, Benedikt Spranger <[email protected]> * Copyright(C) 2005, Thomas Gleixner <[email protected]> -* Copyright(C) 2006, Hans J. Koch <[email protected]> +* Copyright(C) 2006, Hans J. Koch <[email protected]> * Copyright(C) 2006, Greg Kroah-Hartman <[email protected]> * * Userspace IO driver.
Signature · 1 line
1.7.1
PATCH 2/3 driver core: prune docs about device_interface
In reply to Greg KHFrom: Brandon Philips <[email protected]>
drivers/base/intf.c was removed before the beginning of (git) time but its Documentation stuck around. Remove it.
--- Documentation/driver-model/interface.txt | 129 ------------------------------ include/linux/cpu.h | 5 - include/linux/node.h | 5 - 3 files changed, 0 insertions(+), 139 deletions(-) delete mode 100644 Documentation/driver-model/interface.txt
Documentation/driver-model/interface.txt deleted +0 -129
@@ -1,129 +0,0 @@ - -Device Interfaces - -Introduction -~~~~~~~~~~~~ - -Device interfaces are the logical interfaces of device classes that correlate -directly to userspace interfaces, like device nodes. - -Each device class may have multiple interfaces through which you can -access the same device. An input device may support the mouse interface, -the 'evdev' interface, and the touchscreen interface. A SCSI disk would -support the disk interface, the SCSI generic interface, and possibly a raw -device interface. - -Device interfaces are registered with the class they belong to. As devices -are added to the class, they are added to each interface registered with -the class. The interface is responsible for determining whether the device -supports the interface or not. - - -Programming Interface -~~~~~~~~~~~~~~~~~~~~~ - -struct device_interface { - char * name; - rwlock_t lock; - u32 devnum; - struct device_class * devclass; - - struct list_head node; - struct driver_dir_entry dir; - - int (*add_device)(struct device *); - int (*add_device)(struct intf_data *); -}; - -int interface_register(struct device_interface *); -void interface_unregister(struct device_interface *); - - -An interface must specify the device class it belongs to. It is added -to that class's list of interfaces on registration. - - -Interfaces can be added to a device class at any time. Whenever it is -added, each device in the class is passed to the interface's -add_device callback. When an interface is removed, each device is -removed from the interface. - - -Devices -~~~~~~~ -Once a device is added to a device class, it is added to each -interface that is registered with the device class. The class -is expected to place a class-specific data structure in -struct device::class_data. The interface can use that (along with -other fields of struct device) to determine whether or not the driver -and/or device support that particular interface. - - -Data -~~~~ - -struct intf_data { - struct list_head node; - struct device_interface * intf; - struct device * dev; - u32 intf_num; -}; - -int interface_add_data(struct interface_data *); - -The interface is responsible for allocating and initializing a struct -intf_data and calling interface_add_data() to add it to the device's list -of interfaces it belongs to. This list will be iterated over when the device -is removed from the class (instead of all possible interfaces for a class). -This structure should probably be embedded in whatever per-device data -structure the interface is allocating anyway. - -Devices are enumerated within the interface. This happens in interface_add_data() -and the enumerated value is stored in the struct intf_data for that device. - -sysfs -~~~~~ -Each interface is given a directory in the directory of the device -class it belongs to: - -Interfaces get a directory in the class's directory as well: - - class/ - `-- input - |-- devices - |-- drivers - |-- mouse - `-- evdev - -When a device is added to the interface, a symlink is created that points -to the device's directory in the physical hierarchy: - - class/ - `-- input - |-- devices - | `-- 1 -> ../../../root/pci0/00:1f.0/usb_bus/00:1f.2-1:0/ - |-- drivers - | `-- usb:usb_mouse -> ../../../bus/drivers/usb_mouse/ - |-- mouse - | `-- 1 -> ../../../root/pci0/00:1f.0/usb_bus/00:1f.2-1:0/ - `-- evdev - `-- 1 -> ../../../root/pci0/00:1f.0/usb_bus/00:1f.2-1:0/ - - -Future Plans -~~~~~~~~~~~~ -A device interface is correlated directly with a userspace interface -for a device, specifically a device node. For instance, a SCSI disk -exposes at least two interfaces to userspace: the standard SCSI disk -interface and the SCSI generic interface. It might also export a raw -device interface. - -Many interfaces have a major number associated with them and each -device gets a minor number. Or, multiple interfaces might share one -major number, and each will receive a range of minor numbers (like in -the case of input devices). - -These major and minor numbers could be stored in the interface -structure. Major and minor allocations could happen when the interface -is registered with the class, or via a helper function. -
include/linux/cpu.h +0 -5
@@ -10,11 +10,6 @@* * CPUs are exported via sysfs in the class/cpu/devices/ * directory. -* -* Per-cpu interfaces can be implemented using a struct device_interface. -* See the following for how to do this: -* - drivers/base/intf.c -* - Documentation/driver-model/interface.txt */ #ifndef _LINUX_CPU_H_#define _LINUX_CPU_H_
include/linux/node.h +0 -5
@@ -10,11 +10,6 @@* * Nodes are exported via driverfs in the class/node/devices/ * directory. -* -* Per-node interfaces can be implemented using a struct device_interface. -* See the following for how to do this: -* - drivers/base/intf.c -* - Documentation/driver-model/interface.txt */ #ifndef _LINUX_NODE_H_#define _LINUX_NODE_H_
Signature · 1 line
1.7.1