OSDN Git Service

avrcp: Remove dead code
authorAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Fri, 10 Jan 2014 14:56:20 +0000 (16:56 +0200)
committerJohan Hedberg <johan.hedberg@intel.com>
Mon, 13 Jan 2014 08:45:41 +0000 (10:45 +0200)
session->target cannot be NULL since it is already checked 11 lines
above:
...
if (session == NULL || session->target == NULL)
return -ENOTCONN;
...

profiles/audio/avrcp.c

index 8d4309a..197959f 100644 (file)
@@ -3722,30 +3722,14 @@ int avrcp_set_volume(struct btd_device *dev, uint8_t volume)
 
        DBG("volume=%u", volume);
 
-       if (session->target) {
-               pdu->pdu_id = AVRCP_SET_ABSOLUTE_VOLUME;
-               pdu->params[0] = volume;
-               pdu->params_len = htons(1);
+       pdu->pdu_id = AVRCP_SET_ABSOLUTE_VOLUME;
+       pdu->params[0] = volume;
+       pdu->params_len = htons(1);
 
-               return avctp_send_vendordep_req(session->conn,
+       return avctp_send_vendordep_req(session->conn,
                                        AVC_CTYPE_CONTROL, AVC_SUBUNIT_PANEL,
                                        buf, sizeof(buf),
                                        avrcp_handle_set_volume, session);
-       } else if (session->registered_events &
-                                       (1 << AVRCP_EVENT_VOLUME_CHANGED)) {
-               uint8_t id = AVRCP_EVENT_VOLUME_CHANGED;
-               pdu->pdu_id = AVRCP_REGISTER_NOTIFICATION;
-               pdu->params[0] = AVRCP_EVENT_VOLUME_CHANGED;
-               pdu->params[1] = volume;
-               pdu->params_len = htons(2);
-
-               return avctp_send_vendordep(session->conn,
-                                       session->transaction_events[id],
-                                       AVC_CTYPE_CHANGED, AVC_SUBUNIT_PANEL,
-                                       buf, sizeof(buf));
-       }
-
-       return 0;
 }
 
 static int avrcp_connect(struct btd_service *service)