korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-14 22:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

intel_th: Streamline the subdevice tree accessors

Browse Source 
Make to_intel_th*() accessors available from the main header file.

Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>
This commit is contained in:
Alexander Shishkin 2016-11-18 15:05:01 +02:00
parent 5376be63ff
commit 5e06723af9
2 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/hwtracing/intel_th/core.c
View File

@ -156,21 +156,6 @@ static struct device_type intel_th_source_device_type = {
.release = intel_th_device_release, .release = intel_th_device_release,
}; };
static struct intel_th *to_intel_th(struct intel_th_device *thdev)
{
/*
* subdevice tree is flat: if this one is not a switch, its
* parent must be
*/
if (thdev->type != INTEL_TH_SWITCH)
thdev = to_intel_th_hub(thdev);
if (WARN_ON_ONCE(!thdev || thdev->type != INTEL_TH_SWITCH))
return NULL;
return dev_get_drvdata(thdev->dev.parent);
}
static char *intel_th_output_devnode(struct device *dev, umode_t *mode, static char *intel_th_output_devnode(struct device *dev, umode_t *mode,
kuid_t *uid, kgid_t *gid) kuid_t *uid, kgid_t *gid)
{ {

25
drivers/hwtracing/intel_th/intel_th.h
View File

@ -173,7 +173,7 @@ struct intel_th_driver {
((_d) ? to_intel_th_driver(_d) : NULL) ((_d) ? to_intel_th_driver(_d) : NULL)
static inline struct intel_th_device * static inline struct intel_th_device *
to_intel_th_hub(struct intel_th_device *thdev) to_intel_th_parent(struct intel_th_device *thdev)
{ {
struct device *parent = thdev->dev.parent; struct device *parent = thdev->dev.parent;
@ -183,6 +183,29 @@ to_intel_th_hub(struct intel_th_device *thdev)
return to_intel_th_device(parent); return to_intel_th_device(parent);
} }
static inline struct intel_th_device *
to_intel_th_hub(struct intel_th_device *thdev)
{
/*
* subdevice tree is flat: if this one is not a switch, its
* parent must be
*/
if (thdev->type == INTEL_TH_SWITCH)
return thdev;
return to_intel_th_parent(thdev);
}
static inline struct intel_th *to_intel_th(struct intel_th_device *thdev)
{
thdev = to_intel_th_hub(thdev);
if (WARN_ON_ONCE(!thdev || thdev->type != INTEL_TH_SWITCH))
return NULL;
return dev_get_drvdata(thdev->dev.parent);
}
struct intel_th * struct intel_th *
intel_th_alloc(struct device *dev, struct resource *devres, intel_th_alloc(struct device *dev, struct resource *devres,
unsigned int ndevres, int irq); unsigned int ndevres, int irq);