Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 25ea6db0 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by David S. Miller
Browse files

[Bluetooth] Remaining transitions to use kzalloc() 



This patch makes the remaining transitions to use kzalloc().

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent c2ce9204

net/bluetooth/cmtp/capi.c

+1 −3
Original line number Diff line number Diff line
@@ -75,15 +75,13 @@ 


static struct cmtp_application *cmtp_application_add(struct cmtp_session *session, __u16 appl)

{

	struct cmtp_application *app = kmalloc(sizeof(*app), GFP_KERNEL);

	struct cmtp_application *app = kzalloc(sizeof(*app), GFP_KERNEL);



	BT_DBG("session %p application %p appl %d", session, app, appl);



	if (!app)

		return NULL;



	memset(app, 0, sizeof(*app));



	app->state = BT_OPEN;

	app->appl = appl;

net/bluetooth/cmtp/core.c

+1 −2
Original line number Diff line number Diff line
@@ -335,10 +335,9 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock) 
	baswap(&src, &bt_sk(sock->sk)->src);

	baswap(&dst, &bt_sk(sock->sk)->dst);



	session = kmalloc(sizeof(struct cmtp_session), GFP_KERNEL);

	session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);

	if (!session) 

		return -ENOMEM;

	memset(session, 0, sizeof(struct cmtp_session));



	down_write(&cmtp_session_sem);

net/bluetooth/hci_core.c

+2 −5
Original line number Diff line number Diff line
@@ -336,9 +336,8 @@ void hci_inquiry_cache_update(struct hci_dev *hdev, struct inquiry_data *data) 


	if (!(e = hci_inquiry_cache_lookup(hdev, &data->bdaddr))) {

		/* Entry not in the cache. Add new one. */

		if (!(e = kmalloc(sizeof(struct inquiry_entry), GFP_ATOMIC)))

		if (!(e = kzalloc(sizeof(struct inquiry_entry), GFP_ATOMIC)))

			return;

		memset(e, 0, sizeof(struct inquiry_entry));

		e->next     = cache->list;

		cache->list = e;

	}
@@ -800,12 +799,10 @@ struct hci_dev *hci_alloc_dev(void) 
{

	struct hci_dev *hdev;



	hdev = kmalloc(sizeof(struct hci_dev), GFP_KERNEL);

	hdev = kzalloc(sizeof(struct hci_dev), GFP_KERNEL);

	if (!hdev)

		return NULL;



	memset(hdev, 0, sizeof(struct hci_dev));



	skb_queue_head_init(&hdev->driver_init);



	return hdev;

net/bluetooth/hidp/core.c

+1 −2
Original line number Diff line number Diff line
@@ -582,10 +582,9 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock, 
			bacmp(&bt_sk(ctrl_sock->sk)->dst, &bt_sk(intr_sock->sk)->dst))

		return -ENOTUNIQ;



	session = kmalloc(sizeof(struct hidp_session), GFP_KERNEL);

	session = kzalloc(sizeof(struct hidp_session), GFP_KERNEL);

	if (!session)

		return -ENOMEM;

	memset(session, 0, sizeof(struct hidp_session));



	session->input = input_allocate_device();

	if (!session->input) {

net/bluetooth/rfcomm/core.c

+5 −4
Original line number Diff line number Diff line
@@ -273,10 +273,10 @@ static void rfcomm_dlc_clear_state(struct rfcomm_dlc *d) 


struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio)

{

	struct rfcomm_dlc *d = kmalloc(sizeof(*d), prio);

	struct rfcomm_dlc *d = kzalloc(sizeof(*d), prio);



	if (!d)

		return NULL;

	memset(d, 0, sizeof(*d));



	init_timer(&d->timer);

	d->timer.function = rfcomm_dlc_timeout;
@@ -289,6 +289,7 @@ struct rfcomm_dlc *rfcomm_dlc_alloc(gfp_t prio) 
	rfcomm_dlc_clear_state(d);

	

	BT_DBG("%p", d);



	return d;

}
@@ -522,10 +523,10 @@ int rfcomm_dlc_get_modem_status(struct rfcomm_dlc *d, u8 *v24_sig) 
/* ---- RFCOMM sessions ---- */

static struct rfcomm_session *rfcomm_session_add(struct socket *sock, int state)

{

	struct rfcomm_session *s = kmalloc(sizeof(*s), GFP_KERNEL);

	struct rfcomm_session *s = kzalloc(sizeof(*s), GFP_KERNEL);



	if (!s)

		return NULL;

	memset(s, 0, sizeof(*s));



	BT_DBG("session %p sock %p", s, sock);