firewire: remove unnecessary alloc/OOM messages
PATCH 1/1 firewire: remove unnecessary alloc/OOM messages
These are redundant to log messages from the mm core.
Signed-off-by Stefan Richter <[email protected]>
--- drivers/firewire/core-cdev.c | 24 +++++++++--------------- drivers/firewire/core-device.c | 4 +--- drivers/firewire/net.c | 7 +------ drivers/firewire/ohci.c | 3 --- drivers/firewire/sbp2.c | 4 +--- 5 files changed, 12 insertions(+), 30 deletions(-)
drivers/firewire/core-cdev.c +9 -15
@@ -389,10 +389,8 @@ static void queue_bus_reset_event(structstruct 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);
@@ -692,10 +690,9 @@ static void handle_request(struct fw_car 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;
@@ -929,10 +926,9 @@ static void iso_callback(struct fw_iso_cstruct 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;
@@ -949,10 +945,9 @@ static void iso_mc_callback(struct fw_isstruct 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,
@@ -1580,10 +1575,9 @@ void fw_cdev_handle_phy_packet(struct fwlist_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 ;
drivers/firewire/core-device.c +1 -3
@@ -692,10 +692,8 @@ static void create_units(struct fw_devic* 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;
drivers/firewire/net.c +1 -6
@@ -368,10 +368,8 @@ static struct fwnet_fragment_info *fwnet } 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 @@ fail_w_fi: 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 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 ;
drivers/firewire/ohci.c +0 -3
@@ -3711,9 +3711,6 @@ static int pci_probe(struct pci_dev *devkfree (ohci);pmac_ohci_off (dev); fail: -if (err == -ENOMEM ) -dev_err (&dev->dev,"out of memory\n" ); -return err; }
drivers/firewire/sbp2.c +1 -3
@@ -1475,10 +1475,8 @@ static int sbp2_scsi_queuecommand(struct } 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 ;
Signature · 3 lines
Stefan Richter -=====-===-= --== ==--- http://arcgraph.de/sr/