提交 49dce689 编写于 作者: T Tony Jones 提交者: Linus Torvalds

spi doesn't need class_device

Make the SPI framework and drivers stop using class_device.  Update docs
accordingly ...  highlighting just which sysfs paths should be
"safe"/stable.
Signed-off-by: NTony Jones <tonyj@suse.de>
Signed-off-by: NDavid Brownell <dbrownell@users.sourceforge.net>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 cd58310d
...@@ -156,21 +156,29 @@ using the driver model to connect controller and protocol drivers using ...@@ -156,21 +156,29 @@ using the driver model to connect controller and protocol drivers using
device tables provided by board specific initialization code. SPI device tables provided by board specific initialization code. SPI
shows up in sysfs in several locations: shows up in sysfs in several locations:
/sys/devices/.../CTLR ... physical node for a given SPI controller
/sys/devices/.../CTLR/spiB.C ... spi_device on bus "B", /sys/devices/.../CTLR/spiB.C ... spi_device on bus "B",
chipselect C, accessed through CTLR. chipselect C, accessed through CTLR.
/sys/bus/spi/devices/spiB.C ... symlink to that physical
.../CTLR/spiB.C device
/sys/devices/.../CTLR/spiB.C/modalias ... identifies the driver /sys/devices/.../CTLR/spiB.C/modalias ... identifies the driver
that should be used with this device (for hotplug/coldplug) that should be used with this device (for hotplug/coldplug)
/sys/bus/spi/devices/spiB.C ... symlink to the physical
spiB.C device
/sys/bus/spi/drivers/D ... driver for one or more spi*.* devices /sys/bus/spi/drivers/D ... driver for one or more spi*.* devices
/sys/class/spi_master/spiB ... class device for the controller /sys/class/spi_master/spiB ... symlink (or actual device node) to
managing bus "B". All the spiB.* devices share the same a logical node which could hold class related state for the
controller managing bus "B". All spiB.* devices share one
physical SPI bus segment, with SCLK, MOSI, and MISO. physical SPI bus segment, with SCLK, MOSI, and MISO.
Note that the actual location of the controller's class state depends
on whether you enabled CONFIG_SYSFS_DEPRECATED or not. At this time,
the only class-specific state is the bus number ("B" in "spiB"), so
those /sys/class entries are only useful to quickly identify busses.
How does board-specific init code declare SPI devices? How does board-specific init code declare SPI devices?
------------------------------------------------------ ------------------------------------------------------
...@@ -337,7 +345,8 @@ SPI protocol drivers somewhat resemble platform device drivers: ...@@ -337,7 +345,8 @@ SPI protocol drivers somewhat resemble platform device drivers:
The driver core will autmatically attempt to bind this driver to any SPI The driver core will autmatically attempt to bind this driver to any SPI
device whose board_info gave a modalias of "CHIP". Your probe() code device whose board_info gave a modalias of "CHIP". Your probe() code
might look like this unless you're creating a class_device: might look like this unless you're creating a device which is managing
a bus (appearing under /sys/class/spi_master).
static int __devinit CHIP_probe(struct spi_device *spi) static int __devinit CHIP_probe(struct spi_device *spi)
{ {
...@@ -442,7 +451,7 @@ An SPI controller will probably be registered on the platform_bus; write ...@@ -442,7 +451,7 @@ An SPI controller will probably be registered on the platform_bus; write
a driver to bind to the device, whichever bus is involved. a driver to bind to the device, whichever bus is involved.
The main task of this type of driver is to provide an "spi_master". The main task of this type of driver is to provide an "spi_master".
Use spi_alloc_master() to allocate the master, and class_get_devdata() Use spi_alloc_master() to allocate the master, and spi_master_get_devdata()
to get the driver-private data allocated for that device. to get the driver-private data allocated for that device.
struct spi_master *master; struct spi_master *master;
...@@ -452,7 +461,7 @@ to get the driver-private data allocated for that device. ...@@ -452,7 +461,7 @@ to get the driver-private data allocated for that device.
if (!master) if (!master)
return -ENODEV; return -ENODEV;
c = class_get_devdata(&master->cdev); c = spi_master_get_devdata(master);
The driver will initialize the fields of that spi_master, including the The driver will initialize the fields of that spi_master, including the
bus number (maybe the same as the platform device ID) and three methods bus number (maybe the same as the platform device ID) and three methods
......
...@@ -1280,8 +1280,8 @@ static int mmc_spi_probe(struct spi_device *spi) ...@@ -1280,8 +1280,8 @@ static int mmc_spi_probe(struct spi_device *spi)
if (!host->data) if (!host->data)
goto fail_nobuf1; goto fail_nobuf1;
if (spi->master->cdev.dev->dma_mask) { if (spi->master->dev.parent->dma_mask) {
struct device *dev = spi->master->cdev.dev; struct device *dev = spi->master->dev.parent;
host->dma_dev = dev; host->dma_dev = dev;
host->ones_dma = dma_map_single(dev, ones, host->ones_dma = dma_map_single(dev, ones,
......
...@@ -211,7 +211,7 @@ static void atmel_spi_next_message(struct spi_master *master) ...@@ -211,7 +211,7 @@ static void atmel_spi_next_message(struct spi_master *master)
msg = list_entry(as->queue.next, struct spi_message, queue); msg = list_entry(as->queue.next, struct spi_message, queue);
spi = msg->spi; spi = msg->spi;
dev_dbg(master->cdev.dev, "start message %p for %s\n", dev_dbg(master->dev.parent, "start message %p for %s\n",
msg, spi->dev.bus_id); msg, spi->dev.bus_id);
/* select chip if it's not still active */ /* select chip if it's not still active */
...@@ -266,10 +266,10 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master, ...@@ -266,10 +266,10 @@ static void atmel_spi_dma_unmap_xfer(struct spi_master *master,
struct spi_transfer *xfer) struct spi_transfer *xfer)
{ {
if (xfer->tx_dma != INVALID_DMA_ADDRESS) if (xfer->tx_dma != INVALID_DMA_ADDRESS)
dma_unmap_single(master->cdev.dev, xfer->tx_dma, dma_unmap_single(master->dev.parent, xfer->tx_dma,
xfer->len, DMA_TO_DEVICE); xfer->len, DMA_TO_DEVICE);
if (xfer->rx_dma != INVALID_DMA_ADDRESS) if (xfer->rx_dma != INVALID_DMA_ADDRESS)
dma_unmap_single(master->cdev.dev, xfer->rx_dma, dma_unmap_single(master->dev.parent, xfer->rx_dma,
xfer->len, DMA_FROM_DEVICE); xfer->len, DMA_FROM_DEVICE);
} }
...@@ -285,7 +285,7 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as, ...@@ -285,7 +285,7 @@ atmel_spi_msg_done(struct spi_master *master, struct atmel_spi *as,
list_del(&msg->queue); list_del(&msg->queue);
msg->status = status; msg->status = status;
dev_dbg(master->cdev.dev, dev_dbg(master->dev.parent,
"xfer complete: %u bytes transferred\n", "xfer complete: %u bytes transferred\n",
msg->actual_length); msg->actual_length);
...@@ -348,7 +348,7 @@ atmel_spi_interrupt(int irq, void *dev_id) ...@@ -348,7 +348,7 @@ atmel_spi_interrupt(int irq, void *dev_id)
if (xfer->delay_usecs) if (xfer->delay_usecs)
udelay(xfer->delay_usecs); udelay(xfer->delay_usecs);
dev_warn(master->cdev.dev, "fifo overrun (%u/%u remaining)\n", dev_warn(master->dev.parent, "fifo overrun (%u/%u remaining)\n",
spi_readl(as, TCR), spi_readl(as, RCR)); spi_readl(as, TCR), spi_readl(as, RCR));
/* /*
...@@ -363,7 +363,7 @@ atmel_spi_interrupt(int irq, void *dev_id) ...@@ -363,7 +363,7 @@ atmel_spi_interrupt(int irq, void *dev_id)
if (spi_readl(as, SR) & SPI_BIT(TXEMPTY)) if (spi_readl(as, SR) & SPI_BIT(TXEMPTY))
break; break;
if (!timeout) if (!timeout)
dev_warn(master->cdev.dev, dev_warn(master->dev.parent,
"timeout waiting for TXEMPTY"); "timeout waiting for TXEMPTY");
while (spi_readl(as, SR) & SPI_BIT(RDRF)) while (spi_readl(as, SR) & SPI_BIT(RDRF))
spi_readl(as, RDR); spi_readl(as, RDR);
...@@ -526,7 +526,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg) ...@@ -526,7 +526,7 @@ static int atmel_spi_transfer(struct spi_device *spi, struct spi_message *msg)
struct atmel_spi *as; struct atmel_spi *as;
struct spi_transfer *xfer; struct spi_transfer *xfer;
unsigned long flags; unsigned long flags;
struct device *controller = spi->master->cdev.dev; struct device *controller = spi->master->dev.parent;
as = spi_master_get_devdata(spi->master); as = spi_master_get_devdata(spi->master);
......
...@@ -503,7 +503,7 @@ static int __init mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, ...@@ -503,7 +503,7 @@ static int __init mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr,
INIT_LIST_HEAD(&mps->queue); INIT_LIST_HEAD(&mps->queue);
mps->workqueue = create_singlethread_workqueue( mps->workqueue = create_singlethread_workqueue(
master->cdev.dev->bus_id); master->dev.parent->bus_id);
if (mps->workqueue == NULL) { if (mps->workqueue == NULL) {
ret = -EBUSY; ret = -EBUSY;
goto free_irq; goto free_irq;
......
...@@ -1242,7 +1242,7 @@ static int __init init_queue(struct driver_data *drv_data) ...@@ -1242,7 +1242,7 @@ static int __init init_queue(struct driver_data *drv_data)
INIT_WORK(&drv_data->pump_messages, pump_messages); INIT_WORK(&drv_data->pump_messages, pump_messages);
drv_data->workqueue = create_singlethread_workqueue( drv_data->workqueue = create_singlethread_workqueue(
drv_data->master->cdev.dev->bus_id); drv_data->master->dev.parent->bus_id);
if (drv_data->workqueue == NULL) if (drv_data->workqueue == NULL)
return -EBUSY; return -EBUSY;
......
...@@ -204,7 +204,7 @@ struct spi_device *spi_new_device(struct spi_master *master, ...@@ -204,7 +204,7 @@ struct spi_device *spi_new_device(struct spi_master *master,
struct spi_board_info *chip) struct spi_board_info *chip)
{ {
struct spi_device *proxy; struct spi_device *proxy;
struct device *dev = master->cdev.dev; struct device *dev = master->dev.parent;
int status; int status;
/* NOTE: caller did any chip->bus_num checks necessary. /* NOTE: caller did any chip->bus_num checks necessary.
...@@ -239,7 +239,7 @@ struct spi_device *spi_new_device(struct spi_master *master, ...@@ -239,7 +239,7 @@ struct spi_device *spi_new_device(struct spi_master *master,
proxy->modalias = chip->modalias; proxy->modalias = chip->modalias;
snprintf(proxy->dev.bus_id, sizeof proxy->dev.bus_id, snprintf(proxy->dev.bus_id, sizeof proxy->dev.bus_id,
"%s.%u", master->cdev.class_id, "%s.%u", master->dev.bus_id,
chip->chip_select); chip->chip_select);
proxy->dev.parent = dev; proxy->dev.parent = dev;
proxy->dev.bus = &spi_bus_type; proxy->dev.bus = &spi_bus_type;
...@@ -338,18 +338,18 @@ static void scan_boardinfo(struct spi_master *master) ...@@ -338,18 +338,18 @@ static void scan_boardinfo(struct spi_master *master)
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
static void spi_master_release(struct class_device *cdev) static void spi_master_release(struct device *dev)
{ {
struct spi_master *master; struct spi_master *master;
master = container_of(cdev, struct spi_master, cdev); master = container_of(dev, struct spi_master, dev);
kfree(master); kfree(master);
} }
static struct class spi_master_class = { static struct class spi_master_class = {
.name = "spi_master", .name = "spi_master",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.release = spi_master_release, .dev_release = spi_master_release,
}; };
...@@ -357,7 +357,7 @@ static struct class spi_master_class = { ...@@ -357,7 +357,7 @@ static struct class spi_master_class = {
* spi_alloc_master - allocate SPI master controller * spi_alloc_master - allocate SPI master controller
* @dev: the controller, possibly using the platform_bus * @dev: the controller, possibly using the platform_bus
* @size: how much zeroed driver-private data to allocate; the pointer to this * @size: how much zeroed driver-private data to allocate; the pointer to this
* memory is in the class_data field of the returned class_device, * memory is in the driver_data field of the returned device,
* accessible with spi_master_get_devdata(). * accessible with spi_master_get_devdata().
* Context: can sleep * Context: can sleep
* *
...@@ -383,9 +383,9 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size) ...@@ -383,9 +383,9 @@ struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
if (!master) if (!master)
return NULL; return NULL;
class_device_initialize(&master->cdev); device_initialize(&master->dev);
master->cdev.class = &spi_master_class; master->dev.class = &spi_master_class;
master->cdev.dev = get_device(dev); master->dev.parent = get_device(dev);
spi_master_set_devdata(master, &master[1]); spi_master_set_devdata(master, &master[1]);
return master; return master;
...@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master); ...@@ -415,7 +415,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master);
int spi_register_master(struct spi_master *master) int spi_register_master(struct spi_master *master)
{ {
static atomic_t dyn_bus_id = ATOMIC_INIT((1<<15) - 1); static atomic_t dyn_bus_id = ATOMIC_INIT((1<<15) - 1);
struct device *dev = master->cdev.dev; struct device *dev = master->dev.parent;
int status = -ENODEV; int status = -ENODEV;
int dynamic = 0; int dynamic = 0;
...@@ -440,12 +440,12 @@ int spi_register_master(struct spi_master *master) ...@@ -440,12 +440,12 @@ int spi_register_master(struct spi_master *master)
/* register the device, then userspace will see it. /* register the device, then userspace will see it.
* registration fails if the bus ID is in use. * registration fails if the bus ID is in use.
*/ */
snprintf(master->cdev.class_id, sizeof master->cdev.class_id, snprintf(master->dev.bus_id, sizeof master->dev.bus_id,
"spi%u", master->bus_num); "spi%u", master->bus_num);
status = class_device_add(&master->cdev); status = device_add(&master->dev);
if (status < 0) if (status < 0)
goto done; goto done;
dev_dbg(dev, "registered master %s%s\n", master->cdev.class_id, dev_dbg(dev, "registered master %s%s\n", master->dev.bus_id,
dynamic ? " (dynamic)" : ""); dynamic ? " (dynamic)" : "");
/* populate children from any spi device tables */ /* populate children from any spi device tables */
...@@ -478,8 +478,8 @@ void spi_unregister_master(struct spi_master *master) ...@@ -478,8 +478,8 @@ void spi_unregister_master(struct spi_master *master)
{ {
int dummy; int dummy;
dummy = device_for_each_child(master->cdev.dev, NULL, __unregister); dummy = device_for_each_child(master->dev.parent, NULL, __unregister);
class_device_unregister(&master->cdev); device_unregister(&master->dev);
} }
EXPORT_SYMBOL_GPL(spi_unregister_master); EXPORT_SYMBOL_GPL(spi_unregister_master);
...@@ -495,13 +495,13 @@ EXPORT_SYMBOL_GPL(spi_unregister_master); ...@@ -495,13 +495,13 @@ EXPORT_SYMBOL_GPL(spi_unregister_master);
*/ */
struct spi_master *spi_busnum_to_master(u16 bus_num) struct spi_master *spi_busnum_to_master(u16 bus_num)
{ {
struct class_device *cdev; struct device *dev;
struct spi_master *master = NULL; struct spi_master *master = NULL;
struct spi_master *m; struct spi_master *m;
down(&spi_master_class.sem); down(&spi_master_class.sem);
list_for_each_entry(cdev, &spi_master_class.children, node) { list_for_each_entry(dev, &spi_master_class.children, node) {
m = container_of(cdev, struct spi_master, cdev); m = container_of(dev, struct spi_master, dev);
if (m->bus_num == bus_num) { if (m->bus_num == bus_num) {
master = spi_master_get(m); master = spi_master_get(m);
break; break;
......
...@@ -1106,7 +1106,7 @@ static inline int init_queue(struct driver_data *drv_data) ...@@ -1106,7 +1106,7 @@ static inline int init_queue(struct driver_data *drv_data)
/* init messages workqueue */ /* init messages workqueue */
INIT_WORK(&drv_data->pump_messages, pump_messages); INIT_WORK(&drv_data->pump_messages, pump_messages);
drv_data->workqueue = drv_data->workqueue =
create_singlethread_workqueue(drv_data->master->cdev.dev->bus_id); create_singlethread_workqueue(drv_data->master->dev.parent->bus_id);
if (drv_data->workqueue == NULL) if (drv_data->workqueue == NULL)
return -EBUSY; return -EBUSY;
......
...@@ -472,7 +472,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) ...@@ -472,7 +472,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang)
/* this task is the only thing to touch the SPI bits */ /* this task is the only thing to touch the SPI bits */
bitbang->busy = 0; bitbang->busy = 0;
bitbang->workqueue = create_singlethread_workqueue( bitbang->workqueue = create_singlethread_workqueue(
bitbang->master->cdev.dev->bus_id); bitbang->master->dev.parent->bus_id);
if (bitbang->workqueue == NULL) { if (bitbang->workqueue == NULL) {
status = -EBUSY; status = -EBUSY;
goto err1; goto err1;
......
...@@ -1374,7 +1374,7 @@ static int __init init_queue(struct driver_data *drv_data) ...@@ -1374,7 +1374,7 @@ static int __init init_queue(struct driver_data *drv_data)
INIT_WORK(&drv_data->work, pump_messages); INIT_WORK(&drv_data->work, pump_messages);
drv_data->workqueue = create_singlethread_workqueue( drv_data->workqueue = create_singlethread_workqueue(
drv_data->master->cdev.dev->bus_id); drv_data->master->dev.parent->bus_id);
if (drv_data->workqueue == NULL) if (drv_data->workqueue == NULL)
return -EBUSY; return -EBUSY;
......
...@@ -82,7 +82,7 @@ struct spi_lm70llp { ...@@ -82,7 +82,7 @@ struct spi_lm70llp {
struct pardevice *pd; struct pardevice *pd;
struct spi_device *spidev_lm70; struct spi_device *spidev_lm70;
struct spi_board_info info; struct spi_board_info info;
struct class_device *cdev; //struct device *dev;
}; };
/* REVISIT : ugly global ; provides "exclusive open" facility */ /* REVISIT : ugly global ; provides "exclusive open" facility */
......
...@@ -400,7 +400,7 @@ static int __init txx9spi_probe(struct platform_device *dev) ...@@ -400,7 +400,7 @@ static int __init txx9spi_probe(struct platform_device *dev)
goto exit; goto exit;
} }
c->workqueue = create_singlethread_workqueue(master->cdev.dev->bus_id); c->workqueue = create_singlethread_workqueue(master->dev.parent->bus_id);
if (!c->workqueue) if (!c->workqueue)
goto exit; goto exit;
c->last_chipselect = -1; c->last_chipselect = -1;
......
...@@ -195,7 +195,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) ...@@ -195,7 +195,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
/** /**
* struct spi_master - interface to SPI master controller * struct spi_master - interface to SPI master controller
* @cdev: class interface to this driver * @dev: device interface to this driver
* @bus_num: board-specific (and often SOC-specific) identifier for a * @bus_num: board-specific (and often SOC-specific) identifier for a
* given SPI controller. * given SPI controller.
* @num_chipselect: chipselects are used to distinguish individual * @num_chipselect: chipselects are used to distinguish individual
...@@ -222,7 +222,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv) ...@@ -222,7 +222,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
* message's completion function when the transaction completes. * message's completion function when the transaction completes.
*/ */
struct spi_master { struct spi_master {
struct class_device cdev; struct device dev;
/* other than negative (== assign one dynamically), bus_num is fully /* other than negative (== assign one dynamically), bus_num is fully
* board-specific. usually that simplifies to being SOC-specific. * board-specific. usually that simplifies to being SOC-specific.
...@@ -268,17 +268,17 @@ struct spi_master { ...@@ -268,17 +268,17 @@ struct spi_master {
static inline void *spi_master_get_devdata(struct spi_master *master) static inline void *spi_master_get_devdata(struct spi_master *master)
{ {
return class_get_devdata(&master->cdev); return dev_get_drvdata(&master->dev);
} }
static inline void spi_master_set_devdata(struct spi_master *master, void *data) static inline void spi_master_set_devdata(struct spi_master *master, void *data)
{ {
class_set_devdata(&master->cdev, data); dev_set_drvdata(&master->dev, data);
} }
static inline struct spi_master *spi_master_get(struct spi_master *master) static inline struct spi_master *spi_master_get(struct spi_master *master)
{ {
if (!master || !class_device_get(&master->cdev)) if (!master || !get_device(&master->dev))
return NULL; return NULL;
return master; return master;
} }
...@@ -286,7 +286,7 @@ static inline struct spi_master *spi_master_get(struct spi_master *master) ...@@ -286,7 +286,7 @@ static inline struct spi_master *spi_master_get(struct spi_master *master)
static inline void spi_master_put(struct spi_master *master) static inline void spi_master_put(struct spi_master *master)
{ {
if (master) if (master)
class_device_put(&master->cdev); put_device(&master->dev);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册