Bluetooth: Remove redundant disable_advertising()

jaganathkr · holtmann · commit 94386b6a5b2c · 2017-12-13T00:28:42.000+01:00
There is already __hci_req_disable_advertising() function for disabling,
so use it.

Signed-off-by: Jaganath Kanakkassery &lt;jaganathx.kanakkassery@intel.com&gt;
Signed-off-by: Marcel Holtmann &lt;marcel@holtmann.org&gt;
diff --git a/net/bluetooth/hci_request.c b/net/bluetooth/hci_request.c
@@ -1985,13 +1985,6 @@ static void le_scan_restart_work(struct work_struct *work)
 	hci_dev_unlock(hdev);
 }
 
-static void disable_advertising(struct hci_request *req)
-{
-	u8 enable = 0x00;
-
-	hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);
-}
-
 static int active_scan(struct hci_request *req, unsigned long opt)
 {
 	uint16_t interval = opt;
@@ -2017,7 +2010,7 @@ static int active_scan(struct hci_request *req, unsigned long opt)
 		cancel_adv_timeout(hdev);
 		hci_dev_unlock(hdev);
 
-		disable_advertising(req);
+		__hci_req_disable_advertising(req);
 	}
 
 	/* If controller is scanning, it means the background scanning is

Original file line number	Diff line number	Diff line change
`@@ -1985,13 +1985,6 @@ static void le_scan_restart_work(struct work_struct *work)`
`1985`	`1985`	`hci_dev_unlock(hdev);`
`1986`	`1986`	`}`
`1987`	`1987`
`1988`		`-static void disable_advertising(struct hci_request *req)`
`1989`		`-{`
`1990`		`- u8 enable = 0x00;`
`1991`		`-`
`1992`		`- hci_req_add(req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable), &enable);`
`1993`		`-}`
`1994`		`-`
`1995`	`1988`	`static int active_scan(struct hci_request *req, unsigned long opt)`
`1996`	`1989`	`{`
`1997`	`1990`	`uint16_t interval = opt;`
`@@ -2017,7 +2010,7 @@ static int active_scan(struct hci_request *req, unsigned long opt)`
`2017`	`2010`	`cancel_adv_timeout(hdev);`
`2018`	`2011`	`hci_dev_unlock(hdev);`
`2019`	`2012`
`2020`		`- disable_advertising(req);`
	`2013`	`+ __hci_req_disable_advertising(req);`
`2021`	`2014`	`}`
`2022`	`2015`
`2023`	`2016`	`/* If controller is scanning, it means the background scanning is`