Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6dc4d302 authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: fix FIPS mgr naming convention 



The FIPS manager files were using a naming convention which was
inconsistent (ssi vs. cc) and often too long.

Make the code more readable by switching to a simpler, consistent naming
convention.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e2467364

drivers/staging/ccree/ssi_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	}

#endif



	rc = ssi_fips_init(new_drvdata);

	rc = cc_fips_init(new_drvdata);

	if (rc) {

		dev_err(dev, "CC_FIPS_INIT failed 0x%x\n", rc);

		goto post_sysfs_err;
@@ -393,7 +393,7 @@ static int init_cc_resources(struct platform_device *plat_dev) 
post_sram_mgr_err:

	cc_sram_mgr_fini(new_drvdata);

post_fips_init_err:

	ssi_fips_fini(new_drvdata);

	cc_fips_fini(new_drvdata);

post_sysfs_err:

#ifdef ENABLE_CC_SYSFS

	ssi_sysfs_fini();
@@ -424,7 +424,7 @@ static void cleanup_cc_resources(struct platform_device *plat_dev) 
	cc_buffer_mgr_fini(drvdata);

	cc_req_mgr_fini(drvdata);

	cc_sram_mgr_fini(drvdata);

	ssi_fips_fini(drvdata);

	cc_fips_fini(drvdata);

#ifdef ENABLE_CC_SYSFS

	ssi_sysfs_fini();

#endif

drivers/staging/ccree/ssi_fips.c

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ void cc_set_ree_fips_status(struct cc_drvdata *drvdata, bool status) 
	cc_iowrite(drvdata, CC_REG(HOST_GPR0), val);

}



void ssi_fips_fini(struct cc_drvdata *drvdata)

void cc_fips_fini(struct cc_drvdata *drvdata)

{

	struct cc_fips_handle *fips_h = drvdata->fips_handle;
@@ -105,7 +105,7 @@ static void fips_dsr(unsigned long devarg) 
}



/* The function called once at driver entry point .*/

int ssi_fips_init(struct cc_drvdata *p_drvdata)

int cc_fips_init(struct cc_drvdata *p_drvdata)

{

	struct cc_fips_handle *fips_h;

	struct device *dev = drvdata_to_dev(p_drvdata);

drivers/staging/ccree/ssi_fips.h

+4 −4
Original line number Diff line number Diff line
@@ -27,19 +27,19 @@ enum cc_fips_status { 
	CC_FIPS_SYNC_STATUS_RESERVE32B = S32_MAX

};



int ssi_fips_init(struct cc_drvdata *p_drvdata);

void ssi_fips_fini(struct cc_drvdata *drvdata);

int cc_fips_init(struct cc_drvdata *p_drvdata);

void cc_fips_fini(struct cc_drvdata *drvdata);

void fips_handler(struct cc_drvdata *drvdata);

void cc_set_ree_fips_status(struct cc_drvdata *drvdata, bool ok);



#else  /* CONFIG_CRYPTO_FIPS */



static inline int ssi_fips_init(struct cc_drvdata *p_drvdata)

static inline int cc_fips_init(struct cc_drvdata *p_drvdata)

{

	return 0;

}



static inline void ssi_fips_fini(struct cc_drvdata *drvdata) {}

static inline void cc_fips_fini(struct cc_drvdata *drvdata) {}

static inline void cc_set_ree_fips_status(struct cc_drvdata *drvdata,

					  bool ok) {}

static inline void fips_handler(struct cc_drvdata *drvdata) {}