Commit 5a4b5f3d authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branch 'for-6.14/intel-ish' into for-linus 

- dead code removal in intel-ish-hid driver (Dr. David Alan Gilbert)
parents e91b496e b8842f20

drivers/hid/intel-ish-hid/ishtp/client-buffers.c

+0 −21
Original line number Diff line number Diff line
@@ -251,27 +251,6 @@ int ishtp_cl_io_rb_recycle(struct ishtp_cl_rb *rb) 
}

EXPORT_SYMBOL(ishtp_cl_io_rb_recycle);



/**

 * ishtp_cl_tx_empty() -test whether client device tx buffer is empty

 * @cl: Pointer to client device instance

 *

 * Look client device tx buffer list, and check whether this list is empty

 *

 * Return: true if client tx buffer list is empty else false

 */

bool ishtp_cl_tx_empty(struct ishtp_cl *cl)

{

	int tx_list_empty;

	unsigned long tx_flags;



	spin_lock_irqsave(&cl->tx_list_spinlock, tx_flags);

	tx_list_empty = list_empty(&cl->tx_list.list);

	spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags);



	return !!tx_list_empty;

}

EXPORT_SYMBOL(ishtp_cl_tx_empty);



/**

 * ishtp_cl_rx_get_rb() -Get a rb from client device rx buffer list

 * @cl: Pointer to client device instance

drivers/hid/intel-ish-hid/ishtp/client.c

+0 −19
Original line number Diff line number Diff line
@@ -14,25 +14,6 @@ 
#include "hbm.h"

#include "client.h"



int ishtp_cl_get_tx_free_buffer_size(struct ishtp_cl *cl)

{

	unsigned long tx_free_flags;

	int size;



	spin_lock_irqsave(&cl->tx_free_list_spinlock, tx_free_flags);

	size = cl->tx_ring_free_size * cl->device->fw_client->props.max_msg_length;

	spin_unlock_irqrestore(&cl->tx_free_list_spinlock, tx_free_flags);



	return size;

}

EXPORT_SYMBOL(ishtp_cl_get_tx_free_buffer_size);



int ishtp_cl_get_tx_free_rings(struct ishtp_cl *cl)

{

	return cl->tx_ring_free_size;

}

EXPORT_SYMBOL(ishtp_cl_get_tx_free_rings);



/**

 * ishtp_read_list_flush() - Flush read queue

 * @cl: ishtp client instance

drivers/hid/intel-ish-hid/ishtp/client.h

+0 −2
Original line number Diff line number Diff line
@@ -120,8 +120,6 @@ int ishtp_cl_alloc_rx_ring(struct ishtp_cl *cl); 
int ishtp_cl_alloc_tx_ring(struct ishtp_cl *cl);

void ishtp_cl_free_rx_ring(struct ishtp_cl *cl);

void ishtp_cl_free_tx_ring(struct ishtp_cl *cl);

int ishtp_cl_get_tx_free_buffer_size(struct ishtp_cl *cl);

int ishtp_cl_get_tx_free_rings(struct ishtp_cl *cl);



/* DMA I/F functions */

void recv_ishtp_cl_msg_dma(struct ishtp_device *dev, void *msg,

drivers/hid/intel-ish-hid/ishtp/init.c

+0 −30
Original line number Diff line number Diff line
@@ -14,36 +14,6 @@ 
#include "client.h"

#include "loader.h"



/**

 * ishtp_dev_state_str() -Convert to string format

 * @state: state to convert

 *

 * Convert state to string for prints

 *

 * Return: character pointer to converted string

 */

const char *ishtp_dev_state_str(int state)

{

	switch (state) {

	case ISHTP_DEV_INITIALIZING:

		return	"INITIALIZING";

	case ISHTP_DEV_INIT_CLIENTS:

		return	"INIT_CLIENTS";

	case ISHTP_DEV_ENABLED:

		return	"ENABLED";

	case ISHTP_DEV_RESETTING:

		return	"RESETTING";

	case ISHTP_DEV_DISABLED:

		return	"DISABLED";

	case ISHTP_DEV_POWER_DOWN:

		return	"POWER_DOWN";

	case ISHTP_DEV_POWER_UP:

		return	"POWER_UP";

	default:

		return "unknown";

	}

}



/**

 * ishtp_device_init() - ishtp device init

 * @dev: ISHTP device instance

drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ enum ishtp_dev_state { 
	ISHTP_DEV_POWER_DOWN,

	ISHTP_DEV_POWER_UP

};

const char *ishtp_dev_state_str(int state);



struct ishtp_cl;