Skip to content
Open
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
2 changes: 1 addition & 1 deletion bus/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ static struct device_type gip_client_type = {
.release = gip_client_release,
};

static int gip_bus_match(struct device *dev, struct device_driver *driver)
static int gip_bus_match(struct device *dev, const struct device_driver *driver)
{
struct gip_client *client;
struct gip_driver *drv;
Expand Down
6 changes: 2 additions & 4 deletions driver/headset.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,12 @@ static int gip_headset_pcm_close(struct snd_pcm_substream *sub)
static int gip_headset_pcm_hw_params(struct snd_pcm_substream *sub,
struct snd_pcm_hw_params *params)
{
return snd_pcm_lib_alloc_vmalloc_buffer(sub,
params_buffer_bytes(params));
return snd_pcm_lib_malloc_pages(sub, params_buffer_bytes(params));
}

static int gip_headset_pcm_hw_free(struct snd_pcm_substream *sub)
{
return snd_pcm_lib_free_vmalloc_buffer(sub);
return snd_pcm_lib_free_pages(sub);
}

static int gip_headset_pcm_prepare(struct snd_pcm_substream *sub)
Expand Down Expand Up @@ -157,7 +156,6 @@ static const struct snd_pcm_ops gip_headset_pcm_ops = {
.prepare = gip_headset_pcm_prepare,
.trigger = gip_headset_pcm_trigger,
.pointer = gip_headset_pcm_pointer,
.page = snd_pcm_lib_get_vmalloc_page,
};

static bool gip_headset_advance_pointer(struct gip_headset_stream *stream,
Expand Down