diff options
| author | Andres Salomon <dilinger@queued.net> | 2011-03-01 13:55:07 -0800 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-03-23 10:42:02 +0100 |
| commit | 7e5dc1f7004832f797999dfb3498a68a6c16ef73 (patch) | |
| tree | 7ef3cf763a638a68bd7d26a044411cb1e8396bb1 /drivers/w1 | |
| parent | e5c238c3fde93afdddef36aec2642155c709d93a (diff) | |
| download | linux-stable-7e5dc1f7004832f797999dfb3498a68a6c16ef73.tar.gz linux-stable-7e5dc1f7004832f797999dfb3498a68a6c16ef73.tar.bz2 linux-stable-7e5dc1f7004832f797999dfb3498a68a6c16ef73.zip | |
w1: Silence ds1wm warnings related to mfd_get_cell changes
mfd_get_cell returns a const, so change the ds1wm client to store
a const mfd cell. This silences type mismatch warnings.
Since we're guaranteed to have the mfd_cell, we can also simplify
the code a bit to get rid of a temporary variable and NULL check.
Signed-off-by: Andres Salomon <dilinger@queued.net>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/w1')
| -rw-r--r-- | drivers/w1/masters/ds1wm.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c index 22fc726feb9b..95921b77cf86 100644 --- a/drivers/w1/masters/ds1wm.c +++ b/drivers/w1/masters/ds1wm.c @@ -90,7 +90,7 @@ struct ds1wm_data { void __iomem *map; int bus_shift; /* # of shifts to calc register offsets */ struct platform_device *pdev; - struct mfd_cell *cell; + const struct mfd_cell *cell; int irq; int active_high; int slave_present; @@ -330,16 +330,11 @@ static int ds1wm_probe(struct platform_device *pdev) struct ds1wm_data *ds1wm_data; struct ds1wm_driver_data *plat; struct resource *res; - struct mfd_cell *cell; int ret; if (!pdev) return -ENODEV; - cell = mfd_get_cell(pdev); - if (!cell) - return -ENODEV; - ds1wm_data = kzalloc(sizeof(*ds1wm_data), GFP_KERNEL); if (!ds1wm_data) return -ENOMEM; @@ -362,7 +357,7 @@ static int ds1wm_probe(struct platform_device *pdev) ds1wm_data->bus_shift = resource_size(res) >> 3; ds1wm_data->pdev = pdev; - ds1wm_data->cell = cell; + ds1wm_data->cell = mfd_get_cell(pdev); res = platform_get_resource(pdev, IORESOURCE_IRQ, 0); if (!res) { |