Skip to content

Commit a97368b

Browse files
westeriandy-shev
authored andcommitted
platform/x86: intel_pmc_ipc: Drop intel_pmc_gcr_read() and intel_pmc_gcr_write()
These functions are not used anywhere so drop them completely. Signed-off-by: Mika Westerberg <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent f827e53 commit a97368b

File tree

2 files changed

+0
-71
lines changed

2 files changed

+0
-71
lines changed

arch/x86/include/asm/intel_pmc_ipc.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
int intel_pmc_ipc_command(u32 cmd, u32 sub, u8 *in, u32 inlen,
3535
u32 *out, u32 outlen);
3636
int intel_pmc_s0ix_counter_read(u64 *data);
37-
int intel_pmc_gcr_read(u32 offset, u32 *data);
3837
int intel_pmc_gcr_read64(u32 offset, u64 *data);
39-
int intel_pmc_gcr_write(u32 offset, u32 data);
4038

4139
#else
4240

@@ -51,21 +49,11 @@ static inline int intel_pmc_s0ix_counter_read(u64 *data)
5149
return -EINVAL;
5250
}
5351

54-
static inline int intel_pmc_gcr_read(u32 offset, u32 *data)
55-
{
56-
return -EINVAL;
57-
}
58-
5952
static inline int intel_pmc_gcr_read64(u32 offset, u64 *data)
6053
{
6154
return -EINVAL;
6255
}
6356

64-
static inline int intel_pmc_gcr_write(u32 offset, u32 data)
65-
{
66-
return -EINVAL;
67-
}
68-
6957
#endif /*CONFIG_INTEL_PMC_IPC*/
7058

7159
#endif

drivers/platform/x86/intel_pmc_ipc.c

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -210,35 +210,6 @@ static inline int is_gcr_valid(u32 offset)
210210
return 0;
211211
}
212212

213-
/**
214-
* intel_pmc_gcr_read() - Read a 32-bit PMC GCR register
215-
* @offset: offset of GCR register from GCR address base
216-
* @data: data pointer for storing the register output
217-
*
218-
* Reads the 32-bit PMC GCR register at given offset.
219-
*
220-
* Return: negative value on error or 0 on success.
221-
*/
222-
int intel_pmc_gcr_read(u32 offset, u32 *data)
223-
{
224-
int ret;
225-
226-
spin_lock(&ipcdev.gcr_lock);
227-
228-
ret = is_gcr_valid(offset);
229-
if (ret < 0) {
230-
spin_unlock(&ipcdev.gcr_lock);
231-
return ret;
232-
}
233-
234-
*data = readl(ipcdev.gcr_mem_base + offset);
235-
236-
spin_unlock(&ipcdev.gcr_lock);
237-
238-
return 0;
239-
}
240-
EXPORT_SYMBOL_GPL(intel_pmc_gcr_read);
241-
242213
/**
243214
* intel_pmc_gcr_read64() - Read a 64-bit PMC GCR register
244215
* @offset: offset of GCR register from GCR address base
@@ -268,36 +239,6 @@ int intel_pmc_gcr_read64(u32 offset, u64 *data)
268239
}
269240
EXPORT_SYMBOL_GPL(intel_pmc_gcr_read64);
270241

271-
/**
272-
* intel_pmc_gcr_write() - Write PMC GCR register
273-
* @offset: offset of GCR register from GCR address base
274-
* @data: register update value
275-
*
276-
* Writes the PMC GCR register of given offset with given
277-
* value.
278-
*
279-
* Return: negative value on error or 0 on success.
280-
*/
281-
int intel_pmc_gcr_write(u32 offset, u32 data)
282-
{
283-
int ret;
284-
285-
spin_lock(&ipcdev.gcr_lock);
286-
287-
ret = is_gcr_valid(offset);
288-
if (ret < 0) {
289-
spin_unlock(&ipcdev.gcr_lock);
290-
return ret;
291-
}
292-
293-
writel(data, ipcdev.gcr_mem_base + offset);
294-
295-
spin_unlock(&ipcdev.gcr_lock);
296-
297-
return 0;
298-
}
299-
EXPORT_SYMBOL_GPL(intel_pmc_gcr_write);
300-
301242
/**
302243
* intel_pmc_gcr_update() - Update PMC GCR register bits
303244
* @offset: offset of GCR register from GCR address base

0 commit comments

Comments
 (0)