From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Sep 2013 18:37:15 +0000 (-0700)
Subject: Merge tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.12-rc1~184
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=542a086ac72fb193cbc1b996963a572269e57743;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'driver-core-3.12-rc1' of git://git./linux/kernel/git/gregkh/driver-core

Pull driver core patches from Greg KH:
 "Here's the big driver core pull request for 3.12-rc1.

  Lots of tiny changes here fixing up the way sysfs attributes are
  created, to try to make drivers simpler, and fix a whole class race
  conditions with creations of device attributes after the device was
  announced to userspace.

  All the various pieces are acked by the different subsystem
  maintainers"

* tag 'driver-core-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (119 commits)
  firmware loader: fix pending_fw_head list corruption
  drivers/base/memory.c: introduce help macro to_memory_block
  dynamic debug: line queries failing due to uninitialized local variable
  sysfs: sysfs_create_groups returns a value.
  debugfs: provide debugfs_create_x64() when disabled
  rbd: convert bus code to use bus_groups
  firmware: dcdbas: use binary attribute groups
  sysfs: add sysfs_create/remove_groups for when SYSFS is not enabled
  driver core: add #include <linux/sysfs.h> to core files.
  HID: convert bus code to use dev_groups
  Input: serio: convert bus code to use drv_groups
  Input: gameport: convert bus code to use drv_groups
  driver core: firmware: use __ATTR_RW()
  driver core: core: use DEVICE_ATTR_RO
  driver core: bus: use DRIVER_ATTR_WO()
  driver core: create write-only attribute macros for devices and drivers
  sysfs: create __ATTR_WO()
  driver-core: platform: convert bus code to use dev_groups
  workqueue: convert bus code to use dev_groups
  MEI: convert bus code to use dev_groups
  ...
---

542a086ac72fb193cbc1b996963a572269e57743
diff --cc drivers/base/memory.c
index ec386ee,69e09a1..1c61762
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@@ -137,12 -136,9 +136,11 @@@ static ssize_t show_mem_removable(struc
  {
  	unsigned long i, pfn;
  	int ret = 1;
- 	struct memory_block *mem =
- 		container_of(dev, struct memory_block, dev);
+ 	struct memory_block *mem = to_memory_block(dev);
  
  	for (i = 0; i < sections_per_block; i++) {
 +		if (!present_section_nr(mem->start_section_nr + i))
 +			continue;
  		pfn = section_nr_to_pfn(mem->start_section_nr + i);
  		ret &= is_mem_section_removable(pfn, PAGES_PER_SECTION);
  	}