[GIT PATCH] driver core fixes for your 2.6-git tree

[GIT PATCH] driver core fixes for your 2.6-git tree

[Greg KH]

Here are 6 patches for your 2.6-git tree.

They contain:
	- 4 documentation updates:
		- ja_JP/HOWTO update
		- stable_kernel_rules.txt update
		- document the taint flags properly
		- fix some function comments in drivers/base/sys.c that
		  were incorrect.
	- bugfix for the dynamic_printk command line option
	- bugfix for the sysdev code

All of these have been in the -next trees and the -mm releases for a
while now.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

The patches will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

 Documentation/ja_JP/HOWTO             |   14 +++++++-------
 Documentation/stable_kernel_rules.txt |    1 +
 Documentation/sysctl/kernel.txt       |   24 +++++++++++++++++-------
 drivers/base/sys.c                    |   10 ++++++----
 lib/dynamic_printk.c                  |    4 +++-
 5 files changed, 34 insertions(+), 19 deletions(-)

---------------

Andi Kleen (1):
      sysfs: Fix return values for sysdev_store_{ulong,int}

Greg Kroah-Hartman (1):
      Document kernel taint flags properly

Jason Baron (1):
      Driver core: fix 'dynamic_debug' cmd line parameter

Josh Boyer (1):
      Update stable tree documentation

Qinghuang Feng (1):
      driver core: drivers/base/sys.c: update comments

Tsugikazu Shibata (1):
      HOWTO: Sync patch for jp_JP/HOWTO

[GIT PATCH] driver core fixes for your 2.6-git tree

[Greg KH]

Here are 4 patches for your 2.6-git tree.

They contain:
	- licensing fix for the xilinx_hwicap drivers (signed off by the
	  original authors)
	- 2 dynamic debug printk fixes
	- staging Kconfig fix

All of these have been in the -next trees and the -mm releases for a
while now.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

The patches will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

 drivers/char/xilinx_hwicap/buffer_icap.c   |    3 ---
 drivers/char/xilinx_hwicap/buffer_icap.h   |    3 ---
 drivers/char/xilinx_hwicap/fifo_icap.c     |    3 ---
 drivers/char/xilinx_hwicap/fifo_icap.h     |    3 ---
 drivers/char/xilinx_hwicap/xilinx_hwicap.c |    3 ---
 drivers/char/xilinx_hwicap/xilinx_hwicap.h |    3 ---
 drivers/staging/Kconfig                    |    3 +++
 lib/dynamic_printk.c                       |    6 +++---
 8 files changed, 6 insertions(+), 21 deletions(-)

---------------

Dmitry Baryshkov (1):
      STAGING: Move staging drivers back to staging-specific menu

Greg Kroah-Hartman (1):
      xilinx_hwicap: remove improper wording in license statement

Johann Felix Soden (1):
      driver core: fix using 'ret' variable in unregister_dynamic_debug_module

Marcel Holtmann (1):
      driver core: add newlines to debugging enabled/disabled messages

[GIT PATCH] driver core fixes for your 2.6-git tree

[Greg KH]

Here are 4 reverts of patches that were previously pulled into your git
tree.  They revert the ability for the driver core to have a private
area in struct device.

Thanks to Stefan Richter for pointing out the problems with the current
implementation, and for Alan Cox persuading me to rework the whole
thing, which I will do for the 2.6.30 release.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

The patches will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

 drivers/base/base.h    |   26 --------------------------
 drivers/base/bus.c     |   40 +++++++++++++---------------------------
 drivers/base/core.c    |   45 +++++++++++++--------------------------------
 drivers/base/dd.c      |   13 +++++--------
 drivers/base/driver.c  |   13 +++----------
 include/linux/device.h |    7 ++++---
 6 files changed, 38 insertions(+), 106 deletions(-)

---------------

Greg Kroah-Hartman (4):
      Revert "driver core: move knode_bus into private structure"
      Revert "driver core: move knode_driver into private structure"
      Revert "driver core: move klist_children into private structure"
      Revert "driver core: create a private portion of struct device"

[GIT PATCH] driver core fixes for your 2.6-git tree

[Greg KH]

Here are 5 bugfixes against your current kernel git tree.

They fix the following reported problems:
	- klist blowing up on CRIS architecture
	- some block device names showing up incorrectly due to
	  mishandled ! formatting
	- sysfs binary file bugfix
	- debugfs build breakage if it is disable and wimax is enabled.
	- PNP modules not properly being autoloaded due to lowercase
	  issues in file2alias.c

All of these have been in the last -next release, with the majority of
them in the -next releases for the past week.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

The patches will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

 drivers/base/core.c      |    6 ++++++
 fs/sysfs/bin.c           |    6 ++++++
 include/linux/debugfs.h  |    7 +++++++
 include/linux/klist.h    |    2 +-
 scripts/mod/file2alias.c |   17 +++++++++++++++--
 5 files changed, 35 insertions(+), 3 deletions(-)

---------------

Greg Kroah-Hartman (1):
      sysfs: fix problems with binary files

Inaky Perez-Gonzalez (1):
      debugfs: introduce stub for debugfs_create_size_t() when DEBUG_FS=n

Jesper Nilsson (1):
      klist.c: bit 0 in pointer can't be used as flag

Kay Sievers (1):
      PNP: fix broken pnp lowercasing for acpi module aliases

Roland Dreier (1):
      driver core: Convert '/' to '!' in dev_set_name()

[GIT PATCH] driver core fixes for your 2.6-git tree

[Greg KH]

Here are 3 documentation bugfixes against your current kernel git tree.

All of these have been in the -next releases.

Please pull from:
	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/

The patches will be sent as a follow-on to this message to lkml for people
to see.

thanks,

greg k-h

------------

 Documentation/DocBook/uio-howto.tmpl        |   88 +++++++++++++++++++++++++++
 Documentation/ja_JP/stable_kernel_rules.txt |   15 +++--
 drivers/base/core.c                         |    2 +-
 3 files changed, 99 insertions(+), 6 deletions(-)

---------------

Hans J. Koch (1):
      UIO: Add missing documentation of features added recently

Randy Dunlap (1):
      driver-core: fix kernel-doc parameter name

Tsugikazu Shibata (1):
      Sync patch for jp_JP/stable_kernel_rules.txt

[PATCH 1/3] Sync patch for jp_JP/stable_kernel_rules.txt

[Greg Kroah-Hartman]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 3483 bytes --]

From: Tsugikazu Shibata <tshibata@ab.jp.nec.com>

Updated jp_JP/stable_kernel_rules.txt due to changes in the main version
of the file.

Also, this patch is already reviewed by Japanese translation community
called JF.

Signed-off-by: Tsugikazu Shibata <tshibata@ab.jp.nec.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 Documentation/ja_JP/stable_kernel_rules.txt |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Documentation/ja_JP/stable_kernel_rules.txt b/Documentation/ja_JP/stable_kernel_rules.txt
index b3ffe87..1426583 100644
--- a/Documentation/ja_JP/stable_kernel_rules.txt
+++ b/Documentation/ja_JP/stable_kernel_rules.txt
@@ -12,11 +12,11 @@ file at first.
 
 ==================================
 これは、
-linux-2.6.24/Documentation/stable_kernel_rules.txt
+linux-2.6.29/Documentation/stable_kernel_rules.txt
 の和訳です。
 
 翻訳団体： JF プロジェクト < http://www.linux.or.jp/JF/ >
-翻訳日： 2007/12/30
+翻訳日： 2009/1/14
 翻訳者： Tsugikazu Shibata <tshibata at ab dot jp dot nec dot com>
 校正者： 武井伸光さん、<takei at webmasters dot gr dot jp>
          かねこさん (Seiji Kaneko) <skaneko at a2 dot mbn dot or dot jp>
@@ -38,12 +38,15 @@ linux-2.6.24/Documentation/stable_kernel_rules.txt
  - ビルドエラー(CONFIG_BROKENになっているものを除く), oops, ハング、デー
    タ破壊、現実のセキュリティ問題、その他 "ああ、これはダメだね"という
    ようなものを修正しなければならない。短く言えば、重大な問題。
+ - 新しい device ID とクオークも受け入れられる。
  - どのように競合状態が発生するかの説明も一緒に書かれていない限り、
    "理論的には競合状態になる"ようなものは不可。
  - いかなる些細な修正も含めることはできない。(スペルの修正、空白のクリー
    ンアップなど)
- - 対応するサブシステムメンテナが受け入れたものでなければならない。
  - Documentation/SubmittingPatches の規則に従ったものでなければならない。
+ - パッチ自体か同等の修正が Linus のツリーに既に存在しなければならない。
+　 Linus のツリーでのコミットID を -stable へのパッチ投稿の際に引用す
+   ること。
 
 -stable ツリーにパッチを送付する手続き-
 
@@ -52,8 +55,10 @@ linux-2.6.24/Documentation/stable_kernel_rules.txt
  - 送信者はパッチがキューに受け付けられた際には ACK を、却下された場合
    には NAK を受け取る。この反応は開発者たちのスケジュールによって、数
    日かかる場合がある。
- - もし受け取られたら、パッチは他の開発者たちのレビューのために
-   -stable キューに追加される。
+ - もし受け取られたら、パッチは他の開発者たちと関連するサブシステムの
+   メンテナーによるレビューのために -stable キューに追加される。
+ - パッチに stable@kernel.org のアドレスが付加されているときには、それ
+   が Linus のツリーに入る時に自動的に stable チームに email される。
  - セキュリティパッチはこのエイリアス (stable@kernel.org) に送られるべ
    きではなく、代わりに security@kernel.org のアドレスに送られる。
 
-- 
1.6.0.2

[PATCH 2/3] UIO: Add missing documentation of features added recently

[Greg Kroah-Hartman]

From: Hans J. Koch <hjk@linutronix.de>

The following features were added to the UIO framework in the near past:

* Generic drivers for platform devices (uio_pdrv, uio_pdrv_genirq)
* an "offset" sysfs attribute for memory mappings

Unfortunately, all this went in without documentation (won't happen again...)

This patch updates UIO documentation.

Signed-off-by: Hans J. Koch <hjk@linutronix.de>
Acked-by: Uwe Kleine-König <ukleinek@strlen.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 Documentation/DocBook/uio-howto.tmpl |   88 ++++++++++++++++++++++++++++++++++
 1 files changed, 88 insertions(+), 0 deletions(-)

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index b787e47..52e1b79 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -42,6 +42,12 @@ GPL version 2.
 
 <revhistory>
 	<revision>
+	<revnumber>0.7</revnumber>
+	<date>2008-12-23</date>
+	<authorinitials>hjk</authorinitials>
+	<revremark>Added generic platform drivers and offset attribute.</revremark>
+	</revision>
+	<revision>
 	<revnumber>0.6</revnumber>
 	<date>2008-12-05</date>
 	<authorinitials>hjk</authorinitials>
@@ -312,6 +318,16 @@ interested in translating it, please email me
 	pointed to by addr.
 	</para>
 </listitem>
+<listitem>
+	<para>
+	<filename>offset</filename>: The offset, in bytes, that has to be
+	added to the pointer returned by <function>mmap()</function> to get
+	to the actual device memory. This is important if the device's memory
+	is not page aligned. Remember that pointers returned by
+	<function>mmap()</function> are always page aligned, so it is good
+	style to always add this offset.
+	</para>
+</listitem>
 </itemizedlist>
 
 <para>
@@ -594,6 +610,78 @@ framework to set up sysfs files for this region. Simply leave it alone.
 	</para>
 </sect1>
 
+<sect1 id="using_uio_pdrv">
+<title>Using uio_pdrv for platform devices</title>
+	<para>
+	In many cases, UIO drivers for platform devices can be handled in a
+	generic way. In the same place where you define your
+	<varname>struct platform_device</varname>, you simply also implement
+	your interrupt handler and fill your
+	<varname>struct uio_info</varname>. A pointer to this
+	<varname>struct uio_info</varname> is then used as
+	<varname>platform_data</varname> for your platform device.
+	</para>
+	<para>
+	You also need to set up an array of <varname>struct resource</varname>
+	containing addresses and sizes of your memory mappings. This
+	information is passed to the driver using the
+	<varname>.resource</varname> and <varname>.num_resources</varname>
+	elements of <varname>struct platform_device</varname>.
+	</para>
+	<para>
+	You now have to set the <varname>.name</varname> element of
+	<varname>struct platform_device</varname> to
+	<varname>"uio_pdrv"</varname> to use the generic UIO platform device
+	driver. This driver will fill the <varname>mem[]</varname> array
+	according to the resources given, and register the device.
+	</para>
+	<para>
+	The advantage of this approach is that you only have to edit a file
+	you need to edit anyway. You do not have to create an extra driver.
+	</para>
+</sect1>
+
+<sect1 id="using_uio_pdrv_genirq">
+<title>Using uio_pdrv_genirq for platform devices</title>
+	<para>
+	Especially in embedded devices, you frequently find chips where the
+	irq pin is tied to its own dedicated interrupt line. In such cases,
+	where you can be really sure the interrupt is not shared, we can take
+	the concept of <varname>uio_pdrv</varname> one step further and use a
+	generic interrupt handler. That's what
+	<varname>uio_pdrv_genirq</varname> does.
+	</para>
+	<para>
+	The setup for this driver is the same as described above for
+	<varname>uio_pdrv</varname>, except that you do not implement an
+	interrupt handler. The <varname>.handler</varname> element of
+	<varname>struct uio_info</varname> must remain
+	<varname>NULL</varname>. The  <varname>.irq_flags</varname> element
+	must not contain <varname>IRQF_SHARED</varname>.
+	</para>
+	<para>
+	You will set the <varname>.name</varname> element of
+	<varname>struct platform_device</varname> to
+	<varname>"uio_pdrv_genirq"</varname> to use this driver.
+	</para>
+	<para>
+	The generic interrupt handler of <varname>uio_pdrv_genirq</varname>
+	will simply disable the interrupt line using
+	<function>disable_irq_nosync()</function>. After doing its work,
+	userspace can reenable the interrupt by writing 0x00000001 to the UIO
+	device file. The driver already implements an
+	<function>irq_control()</function> to make this possible, you must not
+	implement your own.
+	</para>
+	<para>
+	Using <varname>uio_pdrv_genirq</varname> not only saves a few lines of
+	interrupt handler code. You also do not need to know anything about
+	the chip's internal registers to create the kernel part of the driver.
+	All you need to know is the irq number of the pin the chip is
+	connected to.
+	</para>
+</sect1>
+
 </chapter>
 
 <chapter id="userspace_driver" xreflabel="Writing a driver in user space">
-- 
1.6.0.2

[PATCH 3/3] driver-core: fix kernel-doc parameter name

[Greg Kroah-Hartman]

From: Randy Dunlap <randy.dunlap@oracle.com>

Fix function parameter name in kernel-doc:

Warning(linux-next-20090120//drivers/base/core.c:1289): No description found for parameter 'dev'
Warning(linux-next-20090120//drivers/base/core.c:1289): Excess function parameter 'root' description in 'root_device_unregister'

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Acked-by: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/base/core.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 55e5309..f3eae63 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1280,7 +1280,7 @@ EXPORT_SYMBOL_GPL(__root_device_register);
 
 /**
  * root_device_unregister - unregister and free a root device
- * @root: device going away.
+ * @dev: device going away
  *
  * This function unregisters and cleans up a device that was created by
  * root_device_register().
-- 
1.6.0.2