Noticed by sparse:
drivers/pcmcia/ds.c:962:3: warning: incorrect type in argument 1 (different base types)
drivers/pcmcia/ds.c:962:3: expected struct device const *dev
drivers/pcmcia/ds.c:962:3: got struct pcmcia_device *dev
drivers/pcmcia/ds.c:969:3: warning: incorrect type in argument 1 (different base types)
drivers/pcmcia/ds.c:969:3: expected struct device const *dev
drivers/pcmcia/ds.c:969:3: got struct pcmcia_device *dev
Signed-off-by: Harvey Harrison <[email protected]>
---
Found in next-20080819
drivers/pcmcia/ds.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index ce2a7db..c848b88 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -959,14 +959,14 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev,
* after it has re-checked that there is no possible module
* with a prod_id/manf_id/card_id match.
*/
- ds_dev_dbg(0, dev, "skipping FUNC_ID match until userspace "
+ ds_dev_dbg(0, &dev->dev, "skipping FUNC_ID match until userspace "
"interaction\n");
if (!dev->allow_func_id_match)
return 0;
}
if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {
- ds_dev_dbg(0, dev, "device needs a fake CIS\n");
+ ds_dev_dbg(0, &dev->dev, "device needs a fake CIS\n");
if (!dev->socket->fake_cis)
pcmcia_load_firmware(dev, did->cisfile);
--
1.6.0.274.g8aacc