lkml.org 
[lkml]   [2023]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 19/36] s390/smp: move to use bus_get_dev_root()
    Date
    Direct access to the struct bus_type dev_root pointer is going away soon
    so replace that with a call to bus_get_dev_root() instead, which is what
    it is there for.

    Cc: Heiko Carstens <hca@linux.ibm.com>
    Cc: Vasily Gorbik <gor@linux.ibm.com>
    Cc: Alexander Gordeev <agordeev@linux.ibm.com>
    Cc: Christian Borntraeger <borntraeger@linux.ibm.com>
    Cc: Sven Schnelle <svens@linux.ibm.com>
    Cc: Ilya Leoshkevich <iii@linux.ibm.com>
    Cc: linux-s390@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    Note, this is a patch that is a prepatory cleanup as part of a larger
    series of patches that is working on resolving some old driver core
    design mistakes. It will build and apply cleanly on top of 6.3-rc2 on
    its own, but I'd prefer if I could take it through my driver-core tree
    so that the driver core changes can be taken through there for 6.4-rc1.

    arch/s390/kernel/smp.c | 12 +++++++++---
    1 file changed, 9 insertions(+), 3 deletions(-)

    diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
    index d4888453bbf8..4df797ab8ca2 100644
    --- a/arch/s390/kernel/smp.c
    +++ b/arch/s390/kernel/smp.c
    @@ -1227,11 +1227,17 @@ static DEVICE_ATTR_WO(rescan);

    static int __init s390_smp_init(void)
    {
    + struct device *dev_root;
    int cpu, rc = 0;

    - rc = device_create_file(cpu_subsys.dev_root, &dev_attr_rescan);
    - if (rc)
    - return rc;
    + dev_root = bus_get_dev_root(&cpu_subsys);
    + if (dev_root) {
    + rc = device_create_file(dev_root, &dev_attr_rescan);
    + put_device(dev_root);
    + if (rc)
    + return rc;
    + }
    +
    for_each_present_cpu(cpu) {
    rc = smp_add_present_cpu(cpu);
    if (rc)
    --
    2.39.2
    \
     
     \ /
      Last update: 2023-03-27 00:57    [W:4.037 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site