Commit 605cc30d authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

zlib: move EXPORT_SYMBOL() and MODULE_LICENSE() out of dfltcc_syms.c 

In commit 11fb479f ("zlib: export S390 symbols for zlib modules"), I
added EXPORT_SYMBOL()s to dfltcc_inflate.c but then Mikhail said that
these should probably be in dfltcc_syms.c with the other
EXPORT_SYMBOL()s.

However, that is contrary to the current kernel style, which places
EXPORT_SYMBOL() immediately after the function that it applies to, so
move all EXPORT_SYMBOL()s to their respective function locations and
drop the dfltcc_syms.c file.  Also move MODULE_LICENSE() from the
deleted file to dfltcc.c.

[rdunlap@infradead.org: remove dfltcc_syms.o from Makefile]
  Link: https://lkml.kernel.org/r/20201227171837.15492-1-rdunlap@infradead.org

Link: https://lkml.kernel.org/r/20201219052530.28461-1-rdunlap@infradead.org


Fixes: 11fb479f ("zlib: export S390 symbols for zlib modules")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Acked-by: Ilya Leoshkevich <iii@linux.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Cc: Zaslonko Mikhail <zaslonko@linux.ibm.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f0bb29e8

lib/zlib_dfltcc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,4 +8,4 @@ 


obj-$(CONFIG_ZLIB_DFLTCC) += zlib_dfltcc.o



zlib_dfltcc-objs := dfltcc.o dfltcc_deflate.o dfltcc_inflate.o dfltcc_syms.o
 
zlib_dfltcc-objs := dfltcc.o dfltcc_deflate.o dfltcc_inflate.o

lib/zlib_dfltcc/dfltcc.c

+5 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: Zlib

/* dfltcc.c - SystemZ DEFLATE CONVERSION CALL support. */



#include <linux/zutil.h>

#include <linux/export.h>

#include <linux/module.h>

#include "dfltcc_util.h"

#include "dfltcc.h"
@@ -53,3 +54,6 @@ void dfltcc_reset( 
    dfltcc_state->dht_threshold = DFLTCC_DHT_MIN_SAMPLE_SIZE;

    dfltcc_state->param.ribm = DFLTCC_RIBM;

}

EXPORT_SYMBOL(dfltcc_reset);



MODULE_LICENSE("GPL");

lib/zlib_dfltcc/dfltcc_deflate.c

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "dfltcc_util.h"

#include "dfltcc.h"

#include <asm/setup.h>

#include <linux/export.h>

#include <linux/zutil.h>



/*
@@ -34,6 +35,7 @@ int dfltcc_can_deflate( 


    return 1;

}

EXPORT_SYMBOL(dfltcc_can_deflate);



static void dfltcc_gdht(

    z_streamp strm
@@ -277,3 +279,4 @@ int dfltcc_deflate( 
        goto again; /* deflate() must use all input or all output */

    return 1;

}

EXPORT_SYMBOL(dfltcc_deflate);

lib/zlib_dfltcc/dfltcc_syms.c

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * linux/lib/zlib_dfltcc/dfltcc_syms.c

 *

 * Exported symbols for the s390 zlib dfltcc support.

 *

 */



#include <linux/init.h>

#include <linux/module.h>

#include <linux/zlib.h>

#include "dfltcc.h"



EXPORT_SYMBOL(dfltcc_can_deflate);

EXPORT_SYMBOL(dfltcc_deflate);

EXPORT_SYMBOL(dfltcc_reset);

MODULE_LICENSE("GPL");