diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /sound/ppc | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/keywest.c | 4 | ||||
| -rw-r--r-- | sound/ppc/pmac.c | 2 | ||||
| -rw-r--r-- | sound/ppc/snd_ps3.c | 6 | ||||
| -rw-r--r-- | sound/ppc/tumbler.c | 1 |
4 files changed, 4 insertions, 9 deletions
diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c index 0d1c27e..01aecc2 100644 --- a/sound/ppc/keywest.c +++ b/sound/ppc/keywest.c @@ -65,7 +65,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter) * already bound. If not it means binding failed, and then there * is no point in keeping the device instantiated. */ - if (!keywest_ctx->client->dev.driver) { + if (!keywest_ctx->client->driver) { i2c_unregister_device(keywest_ctx->client); keywest_ctx->client = NULL; return -ENODEV; @@ -76,7 +76,7 @@ static int keywest_attach_adapter(struct i2c_adapter *adapter) * This is safe because i2c-core holds the core_lock mutex for us. */ list_add_tail(&keywest_ctx->client->detected, - &to_i2c_driver(keywest_ctx->client->dev.driver)->clients); + &keywest_ctx->client->driver->clients); return 0; } diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index 7a43c0c..c93fbbb 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c @@ -28,8 +28,6 @@ #include <linux/interrupt.h> #include <linux/pci.h> #include <linux/dma-mapping.h> -#include <linux/of_address.h> -#include <linux/of_irq.h> #include <sound/core.h> #include "pmac.h" #include <sound/pcm_params.h> diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index ebb76f2..8c7dcbe 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -933,10 +933,8 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) int i, ret; u64 lpar_addr, lpar_size; - if (WARN_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1))) - return -ENODEV; - if (WARN_ON(dev->match_id != PS3_MATCH_ID_SOUND)) - return -ENODEV; + BUG_ON(!firmware_has_feature(FW_FEATURE_PS3_LV1)); + BUG_ON(dev->match_id != PS3_MATCH_ID_SOUND); the_card.ps3_dev = dev; diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index b9ffc17..b23354a 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -31,7 +31,6 @@ #include <linux/slab.h> #include <linux/interrupt.h> #include <linux/string.h> -#include <linux/of_irq.h> #include <sound/core.h> #include <asm/io.h> #include <asm/irq.h> |