mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 04:38:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

firewire: remove unnecessary alloc/OOM messages

Browse Source 
These are redundant to log messages from the mm core.

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Stefan Richter 2013-03-24 17:32:00 +01:00
parent d6c8cefc69
commit cfb0c9d1ff
5 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/firewire/core-cdev.c
View File

@ -389,10 +389,8 @@ static void queue_bus_reset_event(struct client *client)
struct bus_reset_event *e;
e = kzalloc(sizeof(*e), GFP_KERNEL);
if (e == NULL) {
fw_notice(client->device->card, "out of memory when allocating event\n");
if (e == NULL)
return;
}
fill_bus_reset_event(&e->reset, client);
@ -693,10 +691,9 @@ static void handle_request(struct fw_card *card, struct fw_request *request,
r = kmalloc(sizeof(*r), GFP_ATOMIC);
e = kmalloc(sizeof(*e), GFP_ATOMIC);
if (r == NULL || e == NULL) {
fw_notice(card, "out of memory when allocating event\n");
if (r == NULL || e == NULL)
goto failed;
}
r->card = card;
r->request = request;
r->data = payload;
@ -930,10 +927,9 @@ static void iso_callback(struct fw_iso_context *context, u32 cycle,
struct iso_interrupt_event *e;
e = kmalloc(sizeof(*e) + header_length, GFP_ATOMIC);
if (e == NULL) {
fw_notice(context->card, "out of memory when allocating event\n");
if (e == NULL)
return;
}
e->interrupt.type = FW_CDEV_EVENT_ISO_INTERRUPT;
e->interrupt.closure = client->iso_closure;
e->interrupt.cycle = cycle;
@ -950,10 +946,9 @@ static void iso_mc_callback(struct fw_iso_context *context,
struct iso_interrupt_mc_event *e;
e = kmalloc(sizeof(*e), GFP_ATOMIC);
if (e == NULL) {
fw_notice(context->card, "out of memory when allocating event\n");
if (e == NULL)
return;
}
e->interrupt.type = FW_CDEV_EVENT_ISO_INTERRUPT_MULTICHANNEL;
e->interrupt.closure = client->iso_closure;
e->interrupt.completed = fw_iso_buffer_lookup(&client->buffer,
@ -1581,10 +1576,9 @@ void fw_cdev_handle_phy_packet(struct fw_card *card, struct fw_packet *p)
list_for_each_entry(client, &card->phy_receiver_list, phy_receiver_link) {
e = kmalloc(sizeof(*e) + 8, GFP_ATOMIC);
if (e == NULL) {
fw_notice(card, "out of memory when allocating event\n");
if (e == NULL)
break;
}
e->phy_packet.closure = client->phy_receiver_closure;
e->phy_packet.type = FW_CDEV_EVENT_PHY_PACKET_RECEIVED;
e->phy_packet.rcode = RCODE_COMPLETE;

4
drivers/firewire/core-device.c
View File

@ -692,10 +692,8 @@ static void create_units(struct fw_device *device)
* match the drivers id_tables against it.
*/
unit = kzalloc(sizeof(*unit), GFP_KERNEL);
if (unit == NULL) {
fw_err(device->card, "out of memory for unit\n");
if (unit == NULL)
continue;
}
unit->directory = ci.p + value - 1;
unit->device.bus = &fw_bus_type;

7
drivers/firewire/net.c
View File

@ -368,10 +368,8 @@ static struct fwnet_fragment_info *fwnet_frag_new(
}
new = kmalloc(sizeof(*new), GFP_ATOMIC);
if (!new) {
dev_err(&pd->skb->dev->dev, "out of memory\n");
if (!new)
return NULL;
}
new->offset = offset;
new->len = len;
@ -414,8 +412,6 @@ static struct fwnet_partial_datagram *fwnet_pd_new(struct net_device *net,
fail_w_new:
kfree(new);
fail:
dev_err(&net->dev, "out of memory\n");
return NULL;
}
@ -692,7 +688,6 @@ static int fwnet_incoming_packet(struct fwnet_device *dev, __be32 *buf, int len,
skb = dev_alloc_skb(len + LL_RESERVED_SPACE(net));
if (unlikely(!skb)) {
dev_err(&net->dev, "out of memory\n");
net->stats.rx_dropped++;
return -ENOMEM;

3
drivers/firewire/ohci.c
View File

@ -3711,9 +3711,6 @@ static int pci_probe(struct pci_dev *dev,
kfree(ohci);
pmac_ohci_off(dev);
fail:
if (err == -ENOMEM)
dev_err(&dev->dev, "out of memory\n");
return err;
}

4
drivers/firewire/sbp2.c
View File

@ -1475,10 +1475,8 @@ static int sbp2_scsi_queuecommand(struct Scsi_Host *shost,
}
orb = kzalloc(sizeof(*orb), GFP_ATOMIC);
if (orb == NULL) {
dev_notice(lu_dev(lu), "failed to alloc ORB\n");
if (orb == NULL)
return SCSI_MLQUEUE_HOST_BUSY;
}
/* Initialize rcode to something not RCODE_COMPLETE. */
orb->base.rcode = -1;