From 5e06723af998779210dffe9553b36b28955d5860 Mon Sep 17 00:00:00 2001 From: Alexander Shishkin Date: Fri, 18 Nov 2016 15:05:01 +0200 Subject: [PATCH] intel_th: Streamline the subdevice tree accessors Git-commit: 5e06723af998779210dffe9553b36b28955d5860 Patch-mainline: v4.14-rc1 References: FATE#325099 Make to_intel_th*() accessors available from the main header file. Signed-off-by: Alexander Shishkin Acked-by: Takashi Iwai --- drivers/hwtracing/intel_th/core.c | 15 --------------- drivers/hwtracing/intel_th/intel_th.h | 25 ++++++++++++++++++++++++- 2 files changed, 24 insertions(+), 16 deletions(-) --- a/drivers/hwtracing/intel_th/core.c +++ b/drivers/hwtracing/intel_th/core.c @@ -157,21 +157,6 @@ static struct device_type intel_th_sourc .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, kuid_t *uid, kgid_t *gid) { --- a/drivers/hwtracing/intel_th/intel_th.h +++ b/drivers/hwtracing/intel_th/intel_th.h @@ -173,7 +173,7 @@ struct intel_th_driver { ((_d) ? to_intel_th_driver(_d) : NULL) 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; @@ -183,6 +183,29 @@ to_intel_th_hub(struct intel_th_device * 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 * intel_th_alloc(struct device *dev, struct resource *devres, unsigned int ndevres, int irq);