Skip to content
Merged
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
8 changes: 3 additions & 5 deletions sound/soc/sof/intel/bdw.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <trace/events/hswadsp.h>
#include <sound/sof.h>
#include <sound/sof/xtensa.h>
Expand Down Expand Up @@ -141,15 +142,12 @@ static u32 bdw_read(struct snd_sof_dev *sdev, void __iomem *addr)
static void bdw_write64(struct snd_sof_dev *sdev, void __iomem *addr,
u64 value)
{
memcpy_toio(addr, &value, sizeof(value));
writeq(value, addr);
}

static u64 bdw_read64(struct snd_sof_dev *sdev, void __iomem *addr)
{
u64 val;

memcpy_fromio(&val, addr, sizeof(val));
return val;
return readq(addr);
}

/*
Expand Down
8 changes: 3 additions & 5 deletions sound/soc/sof/intel/byt.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <trace/events/hswadsp.h>
#include <sound/sof.h>
#include <sound/sof/xtensa.h>
Expand Down Expand Up @@ -116,15 +117,12 @@ static u32 byt_read(struct snd_sof_dev *sdev, void __iomem *addr)
static void byt_write64(struct snd_sof_dev *sdev, void __iomem *addr,
u64 value)
{
memcpy_toio(addr, &value, sizeof(value));
writeq(value, addr);
}

static u64 byt_read64(struct snd_sof_dev *sdev, void __iomem *addr)
{
u64 val;

memcpy_fromio(&val, addr, sizeof(val));
return val;
return readq(addr);
}

/*
Expand Down
8 changes: 3 additions & 5 deletions sound/soc/sof/intel/hda.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include <linux/pm_runtime.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <sound/hdaudio_ext.h>
#include <sound/hdaudio.h>
#include <sound/hda_i915.h>
Expand Down Expand Up @@ -57,15 +58,12 @@ u32 hda_dsp_read(struct snd_sof_dev *sdev, void __iomem *addr)

void hda_dsp_write64(struct snd_sof_dev *sdev, void __iomem *addr, u64 value)
{
memcpy_toio(addr, &value, sizeof(value));
writeq(value, addr);
}

u64 hda_dsp_read64(struct snd_sof_dev *sdev, void __iomem *addr)
{
u64 val;

memcpy_fromio(&val, addr, sizeof(val));
return val;
return readq(addr);
}

/*
Expand Down
8 changes: 3 additions & 5 deletions sound/soc/sof/intel/hsw.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
#include <linux/io.h>
#include <trace/events/hswadsp.h>
#include <sound/sof.h>
#include <sound/sof/xtensa.h>
Expand Down Expand Up @@ -141,15 +142,12 @@ static u32 hsw_read(struct snd_sof_dev *sdev, void __iomem *addr)
static void hsw_write64(struct snd_sof_dev *sdev, void __iomem *addr,
u64 value)
{
memcpy_toio(addr, &value, sizeof(value));
writeq(value, addr);
}

static u64 hsw_read64(struct snd_sof_dev *sdev, void __iomem *addr)
{
u64 val;

memcpy_fromio(&val, addr, sizeof(val));
return val;
return readq(addr);
}

/*
Expand Down