Skip to content

Commit

Permalink
[PATCH] PCMCIA: fix __must_check warnings
Browse files Browse the repository at this point in the history
Fix the remaining __must_check warnings in the PCMCIA core.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
  • Loading branch information
Dominik Brodowski committed Oct 26, 2006
1 parent 4deb7c1 commit f901b8c
Showing 1 changed file with 10 additions and 3 deletions.
13 changes: 10 additions & 3 deletions drivers/pcmcia/ds.c
Original file line number Diff line number Diff line change
Expand Up @@ -717,6 +717,7 @@ static int pcmcia_requery(struct device *dev, void * _data)
static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
{
int no_devices=0;
int ret = 0;
unsigned long flags;

/* must be called with skt_mutex held */
Expand All @@ -729,7 +730,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
* missing resource information or other trouble, we need to
* do this now. */
if (no_devices) {
int ret = pcmcia_card_add(skt);
ret = pcmcia_card_add(skt);
if (ret)
return;
}
Expand All @@ -741,7 +742,9 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt)

/* we re-scan all devices, not just the ones connected to this
* socket. This does not matter, though. */
bus_rescan_devices(&pcmcia_bus_type);
ret = bus_rescan_devices(&pcmcia_bus_type);
if (ret)
printk(KERN_INFO "pcmcia: bus_rescan_devices failed\n");
}

static inline int pcmcia_devmatch(struct pcmcia_device *dev,
Expand Down Expand Up @@ -1001,6 +1004,7 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
struct device_attribute *attr, const char *buf, size_t count)
{
struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
int ret;

if (!count)
return -EINVAL;
Expand All @@ -1009,7 +1013,10 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
p_dev->allow_func_id_match = 1;
mutex_unlock(&p_dev->socket->skt_mutex);

bus_rescan_devices(&pcmcia_bus_type);
ret = bus_rescan_devices(&pcmcia_bus_type);
if (ret)
printk(KERN_INFO "pcmcia: bus_rescan_devices failed after "
"allowing func_id matches\n");

return count;
}
Expand Down

0 comments on commit f901b8c

Please sign in to comment.