From 8ef682d833713dd1e6a10c60c425180e66c0a142 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Fri, 26 Jan 2007 00:56:54 -0800 Subject: [PATCH] --- yaml --- r: 45831 b: refs/heads/master c: 1e9a51dca19dc1d8807c63cb3bd4413d3f95aaf5 h: refs/heads/master i: 45829: 562a87a961d67cada5fba4de42a02b8c0d3cbc47 45827: 3f3198e198405166c18d590be735b9957a0b5394 45823: 3ff96a6e36170c7b85b15bbe388cc0911de672d6 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi.c | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 6b1b4c2b8a88..362d92e36957 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 863c47028eb469c9e6c4e4287b01bea2bbf78766 +refs/heads/master: 1e9a51dca19dc1d8807c63cb3bd4413d3f95aaf5 diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c index 270e6211c2e3..6307428d2c94 100644 --- a/trunk/drivers/spi/spi.c +++ b/trunk/drivers/spi/spi.c @@ -366,7 +366,6 @@ spi_alloc_master(struct device *dev, unsigned size) class_device_initialize(&master->cdev); master->cdev.class = &spi_master_class; - kobj_set_kset_s(&master->cdev, spi_master_class.subsys); master->cdev.dev = get_device(dev); spi_master_set_devdata(master, &master[1]); @@ -466,14 +465,20 @@ EXPORT_SYMBOL_GPL(spi_unregister_master); */ struct spi_master *spi_busnum_to_master(u16 bus_num) { - char name[9]; - struct kobject *bus; - - snprintf(name, sizeof name, "spi%u", bus_num); - bus = kset_find_obj(&spi_master_class.subsys.kset, name); - if (bus) - return container_of(bus, struct spi_master, cdev.kobj); - return NULL; + struct class_device *cdev; + struct spi_master *master = NULL; + struct spi_master *m; + + down(&spi_master_class.sem); + list_for_each_entry(cdev, &spi_master_class.children, node) { + m = container_of(cdev, struct spi_master, cdev); + if (m->bus_num == bus_num) { + master = spi_master_get(m); + break; + } + } + up(&spi_master_class.sem); + return master; } EXPORT_SYMBOL_GPL(spi_busnum_to_master);