Skip to content

Commit

Permalink
Bluetooth: Remove unneeded initialization in hci_alloc_dev()
Browse files Browse the repository at this point in the history
We allocate memory with kzalloc() so there is no need to call
memset(..., 0, ...) or similar.

Signed-off-by: David Herrmann <dh.herrmann@googlemail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
  • Loading branch information
David Herrmann authored and Gustavo Padovan committed May 9, 2012
1 parent b1b813d commit d8ce939
Showing 1 changed file with 0 additions and 10 deletions.
10 changes: 0 additions & 10 deletions net/bluetooth/hci_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1713,20 +1713,16 @@ int hci_le_scan(struct hci_dev *hdev, u8 type, u16 interval, u16 window,
struct hci_dev *hci_alloc_dev(void)
{
struct hci_dev *hdev;
int i;

hdev = kzalloc(sizeof(struct hci_dev), GFP_KERNEL);
if (!hdev)
return NULL;

hdev->flags = 0;
hdev->dev_flags = 0;
hdev->pkt_type = (HCI_DM1 | HCI_DH1 | HCI_HV1);
hdev->esco_type = (ESCO_HV1);
hdev->link_mode = (HCI_LM_ACCEPT);
hdev->io_capability = 0x03; /* No Input No Output */

hdev->idle_timeout = 0;
hdev->sniff_max_interval = 800;
hdev->sniff_min_interval = 80;

Expand Down Expand Up @@ -1761,12 +1757,6 @@ struct hci_dev *hci_alloc_dev(void)

setup_timer(&hdev->cmd_timer, hci_cmd_timer, (unsigned long) hdev);

memset(&hdev->stat, 0, sizeof(struct hci_dev_stats));
atomic_set(&hdev->promisc, 0);

for (i = 0; i < NUM_REASSEMBLY; i++)
hdev->reassembly[i] = NULL;

hci_init_sysfs(hdev);
discovery_init(hdev);
hci_conn_hash_init(hdev);
Expand Down

0 comments on commit d8ce939

Please sign in to comment.