Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6

53baaaa9 · Linus Torvalds <[email protected]> · 2008-07-22 13:13:47 -07:00

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (79 commits)
  arm: bus_id -> dev_name() and dev_set_name() conversions
  sparc64: fix up bus_id changes in sparc core code
  3c59x: handle pci_name() being const
  MTD: handle pci_name() being const
  HP iLO driver
  sysdev: Convert the x86 mce tolerant sysdev attribute to generic attribute
  sysdev: Add utility functions for simple int/ulong variable sysdev attributes
  sysdev: Pass the attribute to the low level sysdev show/store function
  driver core: Suppress sysfs warnings for device_rename().
  kobject: Transmit return value of call_usermodehelper() to caller
  sysfs-rules.txt: reword API stability statement
  debugfs: Implement debugfs_remove_recursive()
  HOWTO: change email addresses of James in HOWTO
  always enable FW_LOADER unless EMBEDDED=y
  uio-howto.tmpl: use unique output names
  uio-howto.tmpl: use standard copyright/legal markings
  sysfs: don't call notify_change
  sysdev: fix debugging statements in registration code.
  kobject: should use kobject_put() in kset-example
  kobject: reorder kobject to save space on 64 bit builds
  ...

Commit: 53baaaa9682c230410a057263d1ce2922f43ddc4
Parents: f10140fb · 3f978704

Merge commit. Changes below are compared with the first parent: f10140fb.

Changes

173 files changed · +2508 −751

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-dev	added	+20	−0	View file
Documentation/DocBook/uio-howto.tmpl	modified	+51	−12	View file
Documentation/HOWTO	modified	+1	−1	View file
Documentation/filesystems/sysfs.txt	modified	+6	−0	View file
Documentation/sysfs-rules.txt	modified	+2	−3	View file
arch/arm/common/dmabounce.c	modified	+9	−13	View file
arch/arm/common/locomo.c	modified	+1	−1	View file
arch/arm/common/sa1111.c	modified	+5	−5	View file
arch/arm/common/scoop.c	modified	+1	−1	View file
arch/arm/kernel/ecard.c	modified	+2	−3	View file
arch/arm/kernel/time.c	modified	+3	−1	View file
arch/arm/mach-integrator/impd1.c	modified	+2	−5	View file
arch/arm/mach-integrator/lm.c	modified	+4	−2	View file
arch/arm/plat-omap/mailbox.c	modified	+1	−1	View file
arch/avr32/kernel/cpu.c	modified	+25	−13	View file
arch/ia64/kernel/err_inject.c	modified	+15	−7	View file
arch/mips/kernel/rtlx.c	modified	+2	−2	View file
arch/mips/sibyte/common/sb_tbprof.c	modified	+2	−1	View file
arch/powerpc/kernel/sysfs.c	modified	+11	−4	View file
arch/powerpc/platforms/cell/cbe_thermal.c	modified	+30	−15	View file
arch/powerpc/platforms/cell/spu_base.c	modified	+2	−1	View file
arch/powerpc/platforms/chrp/pci.c	modified	+1	−1	View file
arch/s390/kernel/smp.c	modified	+24	−12	View file
arch/s390/kernel/time.c	modified	+24	−11	View file
arch/sh/drivers/dma/dma-sysfs.c	modified	+11	−4	View file
arch/sparc64/kernel/ebus.c	modified	+2	−2	View file
arch/sparc64/kernel/of_device.c	modified	+2	−2	View file
arch/sparc64/kernel/pci.c	modified	+1	−1	View file
arch/sparc64/kernel/sysfs.c	modified	+11	−5	View file
arch/sparc64/kernel/vio.c	modified	+8	−10	View file
arch/x86/kernel/cpu/mcheck/mce_64.c	modified	+12	−6	View file
arch/x86/kernel/cpu/mcheck/therm_throt.c	modified	+1	−0	View file
arch/x86/kernel/cpuid.c	modified	+2	−2	View file
arch/x86/kernel/microcode.c	modified	+7	−3	View file
arch/x86/kernel/msr.c	modified	+2	−2	View file
arch/x86/kernel/pci-dma.c	modified	+2	−4	View file
arch/x86/kernel/pci-gart_64.c	modified	+1	−3	View file
block/bsg.c	modified	+2	−1	View file
block/genhd.c	modified	+119	−86	View file
drivers/acpi/fan.c	modified	+5	−5	View file
drivers/acpi/glue.c	modified	+2	−4	View file
drivers/acpi/processor_core.c	modified	+2	−3	View file
drivers/acpi/scan.c	modified	+1	−1	View file
drivers/acpi/thermal.c	modified	+2	−2	View file
drivers/acpi/video.c	modified	+2	−3	View file
drivers/base/Kconfig	modified	+2	−1	View file
drivers/base/base.h	modified	+27	−0	View file
drivers/base/class.c	modified	+89	−64	View file
drivers/base/core.c	modified	+124	−72	View file
drivers/base/cpu.c	modified	+6	−4	View file
drivers/base/memory.c	modified	+8	−4	View file
drivers/base/node.c	modified	+10	−5	View file
drivers/base/power/trace.c	modified	+1	−1	View file
drivers/base/sys.c	modified	+59	−5	View file
drivers/base/topology.c	modified	+12	−5	View file
drivers/block/aoe/aoechr.c	modified	+3	−2	View file
drivers/block/paride/pg.c	modified	+3	−2	View file
drivers/block/paride/pt.c	modified	+6	−4	View file
drivers/block/pktcdvd.c	modified	+3	−1	View file
drivers/char/dsp56k.c	modified	+2	−1	View file
drivers/char/ip2/ip2main.c	modified	+6	−6	View file
drivers/char/ipmi/ipmi_devintf.c	modified	+1	−1	View file
drivers/char/istallion.c	modified	+3	−2	View file
drivers/char/lp.c	modified	+2	−1	View file
drivers/char/mem.c	modified	+3	−3	View file
drivers/char/misc.c	modified	+2	−2	View file
drivers/char/pcmcia/cm4000_cs.c	modified	+1	−1	View file
drivers/char/pcmcia/cm4040_cs.c	modified	+2	−1	View file
drivers/char/ppdev.c	modified	+3	−2	View file
drivers/char/raw.c	modified	+4	−3	View file
drivers/char/snsc.c	modified	+2	−1	View file
drivers/char/stallion.c	modified	+2	−2	View file
drivers/char/tty_io.c	modified	+7	−5	View file
drivers/char/vc_screen.c	modified	+6	−6	View file
drivers/char/viotape.c	modified	+4	−4	View file
drivers/char/vt.c	modified	+8	−6	View file
drivers/char/xilinx_hwicap/xilinx_hwicap.c	modified	+3	−2	View file
drivers/cpuidle/sysfs.c	modified	+7	−3	View file
drivers/dca/dca-sysfs.c	modified	+5	−3	View file
drivers/eisa/Makefile	modified	+1	−1	View file
drivers/eisa/eisa-bus.c	modified	+2	−2	View file
drivers/hid/hidraw.c	modified	+3	−2	View file
drivers/hwmon/hwmon.c	modified	+2	−1	View file
drivers/i2c/i2c-core.c	modified	+4	−2	View file
drivers/i2c/i2c-dev.c	modified	+3	−3	View file
drivers/ide/ide-tape.c	modified	+6	−4	View file
drivers/ieee1394/dv1394.c	modified	+4	−3	View file
drivers/ieee1394/nodemgr.c	modified	+15	−8	View file
drivers/ieee1394/raw1394.c	modified	+2	−2	View file
drivers/ieee1394/video1394.c	modified	+3	−3	View file
drivers/infiniband/core/cm.c	modified	+31	−41	View file
drivers/infiniband/hw/ipath/ipath_file_ops.c	modified	+1	−1	View file
drivers/isdn/capi/capi.c	modified	+2	−1	View file
drivers/macintosh/adb.c	modified	+2	−1	View file
drivers/mca/mca-bus.c	modified	+1	−1	View file
drivers/media/dvb/dvb-core/dvbdev.c	modified	+2	−2	View file
drivers/memstick/host/jmb38x_ms.c	modified	+2	−2	View file
drivers/message/fusion/mptbase.c	modified	+2	−1	View file
drivers/message/fusion/mptbase.h	modified	+2	−2	View file
drivers/message/fusion/mptfc.c	modified	+2	−2	View file
drivers/misc/Kconfig	modified	+13	−0	View file
drivers/misc/Makefile	modified	+1	−0	View file
drivers/misc/hpilo.c	added	+768	−0	View file
drivers/misc/hpilo.h	added	+189	−0	View file
drivers/misc/phantom.c	modified	+3	−2	View file
drivers/mtd/devices/block2mtd.c	modified	+5	−3	View file
drivers/mtd/mtdchar.c	modified	+6	−3	View file
drivers/net/3c59x.c	modified	+1	−1	View file
drivers/net/arm/at91_ether.c	modified	+1	−1	View file
drivers/net/arm/ep93xx_eth.c	modified	+1	−1	View file
drivers/net/arm/etherh.c	modified	+3	−3	View file
drivers/net/ppp_generic.c	modified	+2	−1	View file
drivers/net/wan/cosa.c	modified	+3	−3	View file
drivers/pci/hotplug/acpiphp.h	modified	+2	−2	View file
drivers/power/apm_power.c	modified	+1	−1	View file
drivers/power/power_supply_core.c	modified	+2	−2	View file
drivers/rtc/interface.c	modified	+1	−1	View file
drivers/s390/char/raw3270.c	modified	+8	−6	View file
drivers/s390/char/tape_class.c	modified	+3	−4	View file
drivers/s390/char/vmur.c	modified	+3	−2	View file
drivers/sbus/sbus.c	modified	+3	−3	View file
drivers/scsi/dpt_i2o.c	modified	+2	−2	View file
drivers/scsi/hosts.c	modified	+4	−3	View file
drivers/scsi/scsi_transport_fc.c	modified	+5	−4	View file
drivers/scsi/scsi_transport_iscsi.c	modified	+4	−4	View file
drivers/spi/spi.c	modified	+1	−1	View file
drivers/spi/spidev.c	modified	+2	−2	View file
drivers/uio/Kconfig	modified	+8	−2	View file
drivers/uio/Makefile	modified	+1	−0	View file
drivers/uio/uio.c	modified	+26	−0	View file
drivers/uio/uio_pdrv.c	added	+118	−0	View file
drivers/usb/core/devio.c	modified	+8	−3	View file
drivers/usb/core/file.c	modified	+3	−2	View file
drivers/usb/gadget/printer.c	modified	+2	−2	View file
drivers/usb/mon/mon_bin.c	modified	+3	−2	View file
drivers/video/aty/aty128fb.c	modified	+1	−1	View file
drivers/video/aty/radeonfb.h	modified	+1	−1	View file
drivers/video/console/fbcon.c	modified	+2	−1	View file
drivers/video/fbmem.c	modified	+3	−2	View file
drivers/xen/balloon.c	modified	+1	−0	View file
fs/coda/psdev.c	modified	+3	−2	View file
fs/debugfs/inode.c	modified	+96	−18	View file
fs/partitions/check.c	modified	+1	−1	View file
fs/sysfs/dir.c	modified	+35	−2	View file
fs/sysfs/file.c	modified	+4	−1	View file
fs/sysfs/symlink.c	modified	+33	−8	View file
fs/sysfs/sysfs.h	modified	+1	−0	View file
include/linux/debugfs.h	modified	+4	−0	View file
include/linux/device.h	modified	+36	−22	View file
include/linux/eisa.h	modified	+1	−1	View file
include/linux/kobject.h	modified	+1	−2	View file
include/linux/mtd/map.h	modified	+1	−1	View file
include/linux/mtd/mtd.h	modified	+1	−1	View file
include/linux/spi/spi.h	modified	+1	−1	View file
include/linux/sysdev.h	modified	+37	−2	View file
include/linux/sysfs.h	modified	+10	−0	View file
include/linux/uio_driver.h	modified	+5	−3	View file
include/scsi/scsi_host.h	modified	+1	−1	View file
include/scsi/scsi_transport_fc.h	modified	+2	−2	View file
include/scsi/scsi_transport_iscsi.h	modified	+1	−1	View file
kernel/rtmutex-tester.c	modified	+4	−3	View file
kernel/sched.c	modified	+6	−2	View file
kernel/time/clocksource.c	modified	+6	−2	View file
lib/Kconfig.debug	modified	+3	−0	View file
lib/kobject.c	modified	+8	−2	View file
lib/kobject_uevent.c	modified	+2	−1	View file
net/bluetooth/hci_sysfs.c	modified	+0	−7	View file
samples/firmware_class/firmware_sample_firmware_class.c	modified	+1	−1	View file
samples/kobject/kset-example.c	modified	+1	−1	View file
scripts/mod/file2alias.c	modified	+16	−8	View file
sound/core/init.c	modified	+3	−2	View file
sound/oss/soundcard.c	modified	+8	−6	View file
sound/sound_core.c	modified	+3	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-dev

View file

diff --git a/Documentation/ABI/testing/sysfs-dev b/Documentation/ABI/testing/sysfs-dev
new file mode 100644
index 0000000..a9f2b8b
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-dev
@@ -0,0 +1,20 @@
+What:		/sys/dev
+Date:		April 2008
+KernelVersion:	2.6.26
+Contact:	Dan Williams <[email protected]>
+Description:	The /sys/dev tree provides a method to look up the sysfs
+		path for a device using the information returned from
+		stat(2).  There are two directories, 'block' and 'char',
+		beneath /sys/dev containing symbolic links with names of
+		the form "<major>:<minor>".  These links point to the
+		corresponding sysfs path for the given device.
+
+		Example:
+		$ readlink /sys/dev/block/8:32
+		../../block/sdc
+
+		Entries in /sys/dev/char and /sys/dev/block will be
+		dynamically created and destroyed as devices enter and
+		leave the system.
+
+Users:		mdadm <[email protected]>

Documentation/DocBook/uio-howto.tmpl

View file

diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl
index fdd7f4f..df87d1b 100644
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
@@ -21,6 +21,18 @@
     </affiliation>
 </author>
 
+<copyright>
+	<year>2006-2008</year>
+	<holder>Hans-Jürgen Koch.</holder>
+</copyright>
+
+<legalnotice>
+<para>
+This documentation is Free Software licensed under the terms of the
+GPL version 2.
+</para>
+</legalnotice>
+
 <pubdate>2006-12-11</pubdate>
 
 <abstract>
@@ -30,6 +42,12 @@
 
 <revhistory>
 	<revision>
+	<revnumber>0.5</revnumber>
+	<date>2008-05-22</date>
+	<authorinitials>hjk</authorinitials>
+	<revremark>Added description of write() function.</revremark>
+	</revision>
+	<revision>
 	<revnumber>0.4</revnumber>
 	<date>2007-11-26</date>
 	<authorinitials>hjk</authorinitials>
@@ -57,20 +75,9 @@
 </bookinfo>
 
 <chapter id="aboutthisdoc">
-<?dbhtml filename="about.html"?>
+<?dbhtml filename="aboutthis.html"?>
 <title>About this document</title>
 
-<sect1 id="copyright">
-<?dbhtml filename="copyright.html"?>
-<title>Copyright and License</title>
-<para>
-      Copyright (c) 2006 by Hans-Jürgen Koch.</para>
-<para>
-This documentation is Free Software licensed under the terms of the
-GPL version 2.
-</para>
-</sect1>
-
 <sect1 id="translations">
 <?dbhtml filename="translations.html"?>
 <title>Translations</title>
@@ -189,6 +196,30 @@ interested in translating it, please email me
 	represents the total interrupt count. You can use this number
 	to figure out if you missed some interrupts.
 	</para>
+	<para>
+	For some hardware that has more than one interrupt source internally,
+	but not separate IRQ mask and status registers, there might be
+	situations where userspace cannot determine what the interrupt source
+	was if the kernel handler disables them by writing to the chip's IRQ
+	register. In such a case, the kernel has to disable the IRQ completely
+	to leave the chip's register untouched. Now the userspace part can
+	determine the cause of the interrupt, but it cannot re-enable
+	interrupts. Another cornercase is chips where re-enabling interrupts
+	is a read-modify-write operation to a combined IRQ status/acknowledge
+	register. This would be racy if a new interrupt occurred
+	simultaneously.
+	</para>
+	<para>
+	To address these problems, UIO also implements a write() function. It
+	is normally not used and can be ignored for hardware that has only a
+	single interrupt source or has separate IRQ mask and status registers.
+	If you need it, however, a write to <filename>/dev/uioX</filename>
+	will call the <function>irqcontrol()</function> function implemented
+	by the driver. You have to write a 32-bit value that is usually either
+	0 or 1 to disable or enable interrupts. If a driver does not implement
+	<function>irqcontrol()</function>, <function>write()</function> will
+	return with <varname>-ENOSYS</varname>.
+	</para>
 
 	<para>
 	To handle interrupts properly, your custom kernel module can
@@ -362,6 +393,14 @@ device is actually used.
 <function>open()</function>, you will probably also want a custom
 <function>release()</function> function.
 </para></listitem>
+
+<listitem><para>
+<varname>int (*irqcontrol)(struct uio_info *info, s32 irq_on)
+</varname>: Optional. If you need to be able to enable or disable
+interrupts from userspace by writing to <filename>/dev/uioX</filename>,
+you can implement this function. The parameter <varname>irq_on</varname>
+will be 0 to disable interrupts and 1 to enable them.
+</para></listitem>
 </itemizedlist>
 
 <para>

Documentation/HOWTO

View file

diff --git a/Documentation/HOWTO b/Documentation/HOWTO
index 619e8ca..c2371c5 100644
--- a/Documentation/HOWTO
+++ b/Documentation/HOWTO
@@ -358,7 +358,7 @@ Here is a list of some of the different kernel trees available:
     - pcmcia, Dominik Brodowski <[email protected]>
 	git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 
-    - SCSI, James Bottomley <[email protected]>
+    - SCSI, James Bottomley <[email protected]>
 	git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
 
     - x86, Ingo Molnar <[email protected]>

Documentation/filesystems/sysfs.txt

View file

diff --git a/Documentation/filesystems/sysfs.txt b/Documentation/filesystems/sysfs.txt
index 7f27b8f..9e9c348 100644
--- a/Documentation/filesystems/sysfs.txt
+++ b/Documentation/filesystems/sysfs.txt
@@ -248,6 +248,7 @@ The top level sysfs directory looks like:
 block/
 bus/
 class/
+dev/
 devices/
 firmware/
 net/
@@ -274,6 +275,11 @@ fs/ contains a directory for some filesystems.  Currently each
 filesystem wanting to export attributes must create its own hierarchy
 below fs/ (see ./fuse.txt for an example).
 
+dev/ contains two directories char/ and block/. Inside these two
+directories there are symlinks named <major>:<minor>.  These symlinks
+point to the sysfs directory for the given device.  /sys/dev provides a
+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/sysfs-rules.txt

View file

diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index 80ef562..6049a2a 100644
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
@@ -3,9 +3,8 @@ Rules on how to access information in the Linux kernel sysfs
 The kernel-exported sysfs exports internal kernel implementation details
 and depends on internal kernel structures and layout. It is agreed upon
 by the kernel developers that the Linux kernel does not provide a stable
-internal API. As sysfs is a direct export of kernel internal
-structures, the sysfs interface cannot provide a stable interface either;
-it may always change along with internal kernel changes.
+internal API. Therefore, there are aspects of the sysfs interface that
+may not be stable across kernel releases.
 
 To minimize the risk of breaking users of sysfs, which are in most cases
 low-level userspace applications, with a new kernel release, the users

arch/arm/common/dmabounce.c

View file

diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c
index 2744673..dd29473 100644
--- a/arch/arm/common/dmabounce.c
+++ b/arch/arm/common/dmabounce.c
@@ -554,9 +554,8 @@ dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,
 
 	device_info = kmalloc(sizeof(struct dmabounce_device_info), GFP_ATOMIC);
 	if (!device_info) {
-		printk(KERN_ERR
-			"Could not allocated dmabounce_device_info for %s",
-			dev->bus_id);
+		dev_err(dev,
+			"Could not allocated dmabounce_device_info\n");
 		return -ENOMEM;
 	}
 
@@ -594,8 +593,7 @@ dmabounce_register_dev(struct device *dev, unsigned long small_buffer_size,
 
 	dev->archdata.dmabounce = device_info;
 
-	printk(KERN_INFO "dmabounce: registered device %s on %s bus\n",
-		dev->bus_id, dev->bus->name);
+	dev_info(dev, "dmabounce: registered device\n");
 
 	return 0;
 
@@ -614,16 +612,15 @@ dmabounce_unregister_dev(struct device *dev)
 	dev->archdata.dmabounce = NULL;
 
 	if (!device_info) {
-		printk(KERN_WARNING
-			"%s: Never registered with dmabounce but attempting" \
-			"to unregister!\n", dev->bus_id);
+		dev_warn(dev,
+			 "Never registered with dmabounce but attempting"
+			 "to unregister!\n");
 		return;
 	}
 
 	if (!list_empty(&device_info->safe_buffers)) {
-		printk(KERN_ERR
-			"%s: Removing from dmabounce with pending buffers!\n",
-			dev->bus_id);
+		dev_err(dev,
+			"Removing from dmabounce with pending buffers!\n");
 		BUG();
 	}
 
@@ -639,8 +636,7 @@ dmabounce_unregister_dev(struct device *dev)
 
 	kfree(device_info);
 
-	printk(KERN_INFO "dmabounce: device %s on %s bus unregistered\n",
-		dev->bus_id, dev->bus->name);
+	dev_info(dev, "dmabounce: device unregistered\n");
 }
 
 

arch/arm/common/locomo.c

View file

diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index d973c98..c3c3a33 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -543,7 +543,6 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
 		goto out;
 	}
 
-	strncpy(dev->dev.bus_id, info->name, sizeof(dev->dev.bus_id));
 	/*
 	 * If the parent device has a DMA mask associated with it,
 	 * propagate it down to the children.
@@ -553,6 +552,7 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
 		dev->dev.dma_mask = &dev->dma_mask;
 	}
 
+	dev_set_name(&dev->dev, "%s", info->name);
 	dev->devid	 = info->devid;
 	dev->dev.parent  = lchip->dev;
 	dev->dev.bus     = &locomo_bus_type;

arch/arm/common/sa1111.c

View file

diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index eb06d0b..c8e8f0e 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -550,9 +550,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 		goto out;
 	}
 
-	snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id),
-		 "%4.4lx", info->offset);
-
+	dev_set_name(&dev->dev, "%4.4lx", info->offset);
 	dev->devid	 = info->devid;
 	dev->dev.parent  = sachip->dev;
 	dev->dev.bus     = &sa1111_bus_type;
@@ -560,7 +558,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 	dev->dev.coherent_dma_mask = sachip->dev->coherent_dma_mask;
 	dev->res.start   = sachip->phys + info->offset;
 	dev->res.end     = dev->res.start + 511;
-	dev->res.name    = dev->dev.bus_id;
+	dev->res.name    = dev_name(&dev->dev);
 	dev->res.flags   = IORESOURCE_MEM;
 	dev->mapbase     = sachip->base + info->offset;
 	dev->skpcr_mask  = info->skpcr_mask;
@@ -570,6 +568,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 	if (ret) {
 		printk("SA1111: failed to allocate resource for %s\n",
 			dev->res.name);
+		dev_set_name(&dev->dev, NULL);
 		kfree(dev);
 		goto out;
 	}
@@ -593,7 +592,8 @@ sa1111_init_one_child(struct sa1111 *sachip, struct resource *parent,
 		if (dev->dma_mask != 0xffffffffUL) {
 			ret = dmabounce_register_dev(&dev->dev, 1024, 4096);
 			if (ret) {
-				printk("SA1111: Failed to register %s with dmabounce", dev->dev.bus_id);
+				dev_err(&dev->dev, "SA1111: Failed to register"
+					" with dmabounce\n");
 				device_unregister(&dev->dev);
 			}
 		}

arch/arm/common/scoop.c

View file

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index bc299b0..ae39553 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -247,7 +247,7 @@ static int __devinit scoop_probe(struct platform_device *pdev)
 	devptr->gpio.base = -1;
 
 	if (inf->gpio_base != 0) {
-		devptr->gpio.label = pdev->dev.bus_id;
+		devptr->gpio.label = dev_name(&pdev->dev);
 		devptr->gpio.base = inf->gpio_base;
 		devptr->gpio.ngpio = 12; /* PA11 = 0, PA12 = 1, etc. up to PA22 = 11 */
 		devptr->gpio.set = scoop_gpio_set;

arch/arm/kernel/ecard.c

View file

diff --git a/arch/arm/kernel/ecard.c b/arch/arm/kernel/ecard.c
index 8bfd299..f5cfdab 100644
--- a/arch/arm/kernel/ecard.c
+++ b/arch/arm/kernel/ecard.c
@@ -783,7 +783,7 @@ static void ecard_proc_init(void)
 
 #define ec_set_resource(ec,nr,st,sz)				\
 	do {							\
-		(ec)->resource[nr].name = ec->dev.bus_id;	\
+		(ec)->resource[nr].name = dev_name(&ec->dev);	\
 		(ec)->resource[nr].start = st;			\
 		(ec)->resource[nr].end = (st) + (sz) - 1;	\
 		(ec)->resource[nr].flags = IORESOURCE_MEM;	\
@@ -853,8 +853,7 @@ static struct expansion_card *__init ecard_alloc_card(int type, int slot)
 	for (i = 0; i < ECARD_NUM_RESOURCES; i++) {
 		if (ec->resource[i].flags &&
 		    request_resource(&iomem_resource, &ec->resource[i])) {
-			printk(KERN_ERR "%s: resource(s) not available\n",
-				ec->dev.bus_id);
+			dev_err(&ec->dev, "resource(s) not available\n");
 			ec->resource[i].end -= ec->resource[i].start;
 			ec->resource[i].start = 0;
 			ec->resource[i].flags = 0;

arch/arm/kernel/time.c

View file

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index cc5145b..368d171 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -130,7 +130,9 @@ static const struct leds_evt_name evt_names[] = {
 	{ "red",   led_red_on,   led_red_off   },
 };
 
-static ssize_t leds_store(struct sys_device *dev, const char *buf, size_t size)
+static ssize_t leds_store(struct sys_device *dev,
+			struct sysdev_attribute *attr,
+			const char *buf, size_t size)
 {
 	int ret = -EINVAL, len = strcspn(buf, " ");
 

arch/arm/mach-integrator/impd1.c

View file

diff --git a/arch/arm/mach-integrator/impd1.c b/arch/arm/mach-integrator/impd1.c
index 62e653a..5a1588c 100644
--- a/arch/arm/mach-integrator/impd1.c
+++ b/arch/arm/mach-integrator/impd1.c
@@ -393,9 +393,7 @@ static int impd1_probe(struct lm_device *dev)
 		if (!d)
 			continue;
 
-		snprintf(d->dev.bus_id, sizeof(d->dev.bus_id),
-			 "lm%x:%5.5lx", dev->id, idev->offset >> 12);
-
+		dev_set_name(&d->dev, "lm%x:%5.5lx", dev->id, idev->offset >> 12);
 		d->dev.parent	= &dev->dev;
 		d->res.start	= dev->resource.start + idev->offset;
 		d->res.end	= d->res.start + SZ_4K - 1;
@@ -407,8 +405,7 @@ static int impd1_probe(struct lm_device *dev)
 
 		ret = amba_device_register(d, &dev->resource);
 		if (ret) {
-			printk("unable to register device %s: %d\n",
-				d->dev.bus_id, ret);
+			dev_err(&d->dev, "unable to register device: %d\n");
 			kfree(d);
 		}
 	}

arch/arm/mach-integrator/lm.c

View file

diff --git a/arch/arm/mach-integrator/lm.c b/arch/arm/mach-integrator/lm.c
index 622cdc4..f939c50 100644
--- a/arch/arm/mach-integrator/lm.c
+++ b/arch/arm/mach-integrator/lm.c
@@ -81,8 +81,10 @@ int lm_device_register(struct lm_device *dev)
 	dev->dev.release = lm_device_release;
 	dev->dev.bus = &lm_bustype;
 
-	snprintf(dev->dev.bus_id, sizeof(dev->dev.bus_id), "lm%d", dev->id);
-	dev->resource.name = dev->dev.bus_id;
+	ret = dev_set_name(&dev->dev, "lm%d", dev->id);
+	if (ret)
+		return ret;
+	dev->resource.name = dev_name(&dev->dev);
 
 	ret = request_resource(&iomem_resource, &dev->resource);
 	if (ret == 0) {

arch/arm/plat-omap/mailbox.c

View file

diff --git a/arch/arm/plat-omap/mailbox.c b/arch/arm/plat-omap/mailbox.c
index 6f33f58..ff1413e 100644
--- a/arch/arm/plat-omap/mailbox.c
+++ b/arch/arm/plat-omap/mailbox.c
@@ -334,7 +334,7 @@ static int omap_mbox_init(struct omap_mbox *mbox)
 	}
 
 	mbox->dev.class = &omap_mbox_class;
-	strlcpy(mbox->dev.bus_id, mbox->name, KOBJ_NAME_LEN);
+	dev_set_name(&mbox->dev, "%s", mbox->name);
 	dev_set_drvdata(&mbox->dev, mbox);
 
 	ret = device_register(&mbox->dev);

arch/avr32/kernel/cpu.c

View file

diff --git a/arch/avr32/kernel/cpu.c b/arch/avr32/kernel/cpu.c
index b8409ca..e84faff 100644
--- a/arch/avr32/kernel/cpu.c
+++ b/arch/avr32/kernel/cpu.c
@@ -26,14 +26,16 @@ static DEFINE_PER_CPU(struct cpu, cpu_devices);
  * XXX: If/when a SMP-capable implementation of AVR32 will ever be
  * made, we must make sure that the code executes on the correct CPU.
  */
-static ssize_t show_pc0event(struct sys_device *dev, char *buf)
+static ssize_t show_pc0event(struct sys_device *dev,
+			struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long pccr;
 
 	pccr = sysreg_read(PCCR);
 	return sprintf(buf, "0x%lx\n", (pccr >> 12) & 0x3f);
 }
-static ssize_t store_pc0event(struct sys_device *dev, const char *buf,
+static ssize_t store_pc0event(struct sys_device *dev,
+			struct sysdev_attribute *attr, const char *buf,
 			      size_t count)
 {
 	unsigned long val;
@@ -46,15 +48,17 @@ static ssize_t store_pc0event(struct sys_device *dev, const char *buf,
 	sysreg_write(PCCR, val);
 	return count;
 }
-static ssize_t show_pc0count(struct sys_device *dev, char *buf)
+static ssize_t show_pc0count(struct sys_device *dev,
+			struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long pcnt0;
 
 	pcnt0 = sysreg_read(PCNT0);
 	return sprintf(buf, "%lu\n", pcnt0);
 }
-static ssize_t store_pc0count(struct sys_device *dev, const char *buf,
-			      size_t count)
+static ssize_t store_pc0count(struct sys_device *dev,
+				struct sysdev_attribute *attr,
+				const char *buf, size_t count)
 {
 	unsigned long val;
 	char *endp;
@@ -67,14 +71,16 @@ static ssize_t store_pc0count(struct sys_device *dev, const char *buf,
 	return count;
 }
 
-static ssize_t show_pc1event(struct sys_device *dev, char *buf)
+static ssize_t show_pc1event(struct sys_device *dev,
+				struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long pccr;
 
 	pccr = sysreg_read(PCCR);
 	return sprintf(buf, "0x%lx\n", (pccr >> 18) & 0x3f);
 }
-static ssize_t store_pc1event(struct sys_device *dev, const char *buf,
+static ssize_t store_pc1event(struct sys_device *dev,
+			      struct sysdev_attribute *attr, const char *buf,
 			      size_t count)
 {
 	unsigned long val;
@@ -87,14 +93,16 @@ static ssize_t store_pc1event(struct sys_device *dev, const char *buf,
 	sysreg_write(PCCR, val);
 	return count;
 }
-static ssize_t show_pc1count(struct sys_device *dev, char *buf)
+static ssize_t show_pc1count(struct sys_device *dev,
+				struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long pcnt1;
 
 	pcnt1 = sysreg_read(PCNT1);
 	return sprintf(buf, "%lu\n", pcnt1);
 }
-static ssize_t store_pc1count(struct sys_device *dev, const char *buf,
+static ssize_t store_pc1count(struct sys_device *dev,
+				struct sysdev_attribute *attr, const char *buf,
 			      size_t count)
 {
 	unsigned long val;
@@ -108,14 +116,16 @@ static ssize_t store_pc1count(struct sys_device *dev, const char *buf,
 	return count;
 }
 
-static ssize_t show_pccycles(struct sys_device *dev, char *buf)
+static ssize_t show_pccycles(struct sys_device *dev,
+				struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long pccnt;
 
 	pccnt = sysreg_read(PCCNT);
 	return sprintf(buf, "%lu\n", pccnt);
 }
-static ssize_t store_pccycles(struct sys_device *dev, const char *buf,
+static ssize_t store_pccycles(struct sys_device *dev,
+				struct sysdev_attribute *attr, const char *buf,
 			      size_t count)
 {
 	unsigned long val;
@@ -129,14 +139,16 @@ static ssize_t store_pccycles(struct sys_device *dev, const char *buf,
 	return count;
 }
 
-static ssize_t show_pcenable(struct sys_device *dev, char *buf)
+static ssize_t show_pcenable(struct sys_device *dev,
+			struct sysdev_attribute *attr, char *buf)
 {
 	unsigned long pccr;
 
 	pccr = sysreg_read(PCCR);
 	return sprintf(buf, "%c\n", (pccr & 1)?'1':'0');
 }
-static ssize_t store_pcenable(struct sys_device *dev, const char *buf,
+static ssize_t store_pcenable(struct sys_device *dev,
+			      struct sysdev_attribute *attr, const char *buf,
 			      size_t count)
 {
 	unsigned long pccr, val;

arch/ia64/kernel/err_inject.c

View file

diff --git a/arch/ia64/kernel/err_inject.c b/arch/ia64/kernel/err_inject.c
index b642648..c539c68 100644
--- a/arch/ia64/kernel/err_inject.c
+++ b/arch/ia64/kernel/err_inject.c
@@ -55,7 +55,8 @@ static u64 resources[NR_CPUS];
 
 #define show(name) 							\
 static ssize_t 								\
-show_##name(struct sys_device *dev, char *buf)				\
+show_##name(struct sys_device *dev, struct sysdev_attribute *attr,	\
+		char *buf)						\
 {									\
 	u32 cpu=dev->id;						\
 	return sprintf(buf, "%lx\n", name[cpu]);			\
@@ -63,7 +64,8 @@ show_##name(struct sys_device *dev, char *buf)				\
 
 #define store(name)							\
 static ssize_t 								\
-store_##name(struct sys_device *dev, const char *buf, size_t size)	\
+store_##name(struct sys_device *dev, struct sysdev_attribute *attr,	\
+					const char *buf, size_t size)	\
 {									\
 	unsigned int cpu=dev->id;					\
 	name[cpu] = simple_strtoull(buf, NULL, 16);			\
@@ -76,7 +78,8 @@ show(call_start)
  * processor. The cpu number in driver is only used for storing data.
  */
 static ssize_t
-store_call_start(struct sys_device *dev, const char *buf, size_t size)
+store_call_start(struct sys_device *dev, struct sysdev_attribute *attr,
+		const char *buf, size_t size)
 {
 	unsigned int cpu=dev->id;
 	unsigned long call_start = simple_strtoull(buf, NULL, 16);
@@ -124,14 +127,16 @@ show(err_type_info)
 store(err_type_info)
 
 static ssize_t
-show_virtual_to_phys(struct sys_device *dev, char *buf)
+show_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,
+			char *buf)
 {
 	unsigned int cpu=dev->id;
 	return sprintf(buf, "%lx\n", phys_addr[cpu]);
 }
 
 static ssize_t
-store_virtual_to_phys(struct sys_device *dev, const char *buf, size_t size)
+store_virtual_to_phys(struct sys_device *dev, struct sysdev_attribute *attr,
+			const char *buf, size_t size)
 {
 	unsigned int cpu=dev->id;
 	u64 virt_addr=simple_strtoull(buf, NULL, 16);
@@ -154,7 +159,8 @@ show(err_struct_info)
 store(err_struct_info)
 
 static ssize_t
-show_err_data_buffer(struct sys_device *dev, char *buf)
+show_err_data_buffer(struct sys_device *dev,
+			struct sysdev_attribute *attr, char *buf)
 {
 	unsigned int cpu=dev->id;
 
@@ -165,7 +171,9 @@ show_err_data_buffer(struct sys_device *dev, char *buf)
 }
 
 static ssize_t
-store_err_data_buffer(struct sys_device *dev, const char *buf, size_t size)
+store_err_data_buffer(struct sys_device *dev,
+			struct sysdev_attribute *attr,
+			const char *buf, size_t size)