Skip to content
Closed

Temp #34

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions audioreach-driver/q6apm_audio_pkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ do { \
#define MODULE_NAME "audio-pkt"
#define MINOR_NUMBER_COUNT 1
#define AUDPKT_DRIVER_NAME "aud_pasthru_adsp"
#define CHANNEL_NAME "to_apps"
#define APM_AUDIO_DRV_NAME "q6apm-audio-pkt"

struct q6apm_audio_pkt {
Expand All @@ -74,8 +73,6 @@ struct q6apm_audio_pkt {
spinlock_t queue_lock;
struct sk_buff_head queue;
wait_queue_head_t readq;
char dev_name[20];
char ch_name[20];
dev_t audio_pkt_major;
struct class *audio_pkt_class;

Expand Down Expand Up @@ -264,8 +261,6 @@ static int audio_pkt_open(struct inode *inode, struct file *file)
struct q6apm_audio_pkt *audpkt_dev = cdev_to_audpkt_dev(inode->i_cdev);
struct device *dev = audpkt_dev->dev;

AUDIO_PKT_ERR("for %s\n", audpkt_dev->ch_name);

get_device(dev);
file->private_data = audpkt_dev;

Expand Down Expand Up @@ -552,10 +547,7 @@ static int q6apm_audio_pkt_probe(gpr_device_t *adev)
goto err_device;
}

strscpy(apm->dev_name, CHANNEL_NAME, 20);
strscpy(apm->ch_name, CHANNEL_NAME, 20);
dev_set_name(apm->dev, apm->dev_name);

dev_set_name(apm->dev, AUDPKT_DRIVER_NAME);

dev_set_drvdata(dev, apm);

Expand All @@ -578,8 +570,7 @@ static int q6apm_audio_pkt_probe(gpr_device_t *adev)
ret = cdev_add(&apm->cdev, apm->audio_pkt_major,
MINOR_NUMBER_COUNT);
if (ret) {
AUDIO_PKT_ERR("cdev_add failed for %s ret:%d\n",
apm->dev_name, ret);
AUDIO_PKT_ERR("cdev_add failed with ret:%d\n",ret);
goto free_dev;
}

Expand Down
2 changes: 2 additions & 0 deletions ipc/audio-pkt.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ do { \
* @audio_pkt_major: Major number of audio pkt driver
* @audio_pkt_class: audio pkt class pointer
*/

# test run
struct audio_pkt_device {
gpr_device_t *adev;
struct device *dev;
Expand Down
Loading