Hi, Linus.
It seems my previous request for 'i2c-for-2630' has been lost, please
consider this new pull request 'i2c-for-2630-v2' which has additional
driver and cleanup patches.
The following changes since commit d508afb437daee7cf07da085b635c44a4ebf9b38:
Trond Myklebust (1):
NFS: Fix a double free in nfs_parse_mount_options()
are available in the git repository at:
git://aeryn.fluff.org.uk/bjdooks/linux.git i2c-for-2630-v2
Ben Dooks (1):
i2c-s3c2410: sda_delay should be in ns, not clock ticks
Daniel Silverstone (1):
i2c-s3c2410: Simplify bus frequency calculation
Darius Augulis (2):
i2c: iMX/MXC support
i2c: imx: Add missing request_mem_region in probe()
Mark Brown (1):
i2c: i2c-s3c2410: Initialise Samsung I2C controller early
Oskar Schirmer (1):
i2c: xtensa s6000 i2c driver
Wolfgang Grandegger (4):
i2c: i2c-mpc: various coding style fixes
i2c: i2c-mpc: use dev based printout function
i2c: i2c-mpc: make I2C bus speed configurable
powerpc/85xx: i2c-mpc: use new I2C bindings for the Socates board
Wolfram Sang (1):
i2c: imx: Make disable_delay a per-device variable
arch/arm/mach-s3c2410/mach-bast.c | 3 +-
arch/arm/mach-s3c2410/mach-n30.c | 3 +-
arch/arm/mach-s3c2412/mach-jive.c | 3 +-
arch/arm/plat-mxc/include/mach/i2c.h | 25 ++
arch/arm/plat-s3c/dev-i2c0.c | 7 +-
arch/arm/plat-s3c/dev-i2c1.c | 7 +-
arch/arm/plat-s3c/include/plat/iic.h | 33 +-
arch/powerpc/boot/dts/socrates.dts | 8 +-
drivers/i2c/busses/Kconfig | 20 ++
drivers/i2c/busses/Makefile | 2 +
drivers/i2c/busses/i2c-imx.c | 624 ++++++++++++++++++++++++++++++++++
drivers/i2c/busses/i2c-mpc.c | 322 +++++++++++++++---
drivers/i2c/busses/i2c-s3c2410.c | 77 ++---
drivers/i2c/busses/i2c-s6000.c | 407 ++++++++++++++++++++++
drivers/i2c/busses/i2c-s6000.h | 79 +++++
include/linux/i2c/s6000.h | 10 +
16 files changed, 1504 insertions(+), 126 deletions(-)
create mode 100644 arch/arm/plat-mxc/include/mach/i2c.h
create mode 100644 drivers/i2c/busses/i2c-imx.c
create mode 100644 drivers/i2c/busses/i2c-s6000.c
create mode 100644 drivers/i2c/busses/i2c-s6000.h
create mode 100644 include/linux/i2c/s6000.h
Use the dev_name() helper to get a name string for a device instead of
open-coding random device field accesses.
With '1fa5ae8 driver core: get rid of struct device's bus_id string
array' in place, this is not just a cleanup but a compilation fix.
Signed-off-by: Johannes Weiner <[email protected]>
---
drivers/i2c/busses/i2c-s6000.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Sorry, went unnoticed until the compilation broke on a newer kernel
with the above mentioned commit. Please apply.
diff --git a/drivers/i2c/busses/i2c-s6000.c b/drivers/i2c/busses/i2c-s6000.c
index c91359f..a19af51 100644
--- a/drivers/i2c/busses/i2c-s6000.c
+++ b/drivers/i2c/busses/i2c-s6000.c
@@ -276,7 +276,7 @@ static int __devinit s6i2c_probe(struct platform_device *dev)
}
iface->res = request_mem_region(iface->res->start,
resource_size(iface->res),
- dev->dev.bus_id);
+ dev_name(&dev->dev));
if (!iface->res) {
rc = -EBUSY;
goto err_out;
--
1.6.2.107.ge47ee