Message ID | 20171023073429.GA10952@nazgul.tnic (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Herbert Xu |
Headers | show |
On 10/23/2017 02:34 AM, Borislav Petkov wrote: ... > > Just minor cleanups: > Thanks Boris, I have applied your cleanups. -Brijesh > --- > diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c > index e9966d5fc6c4..f9a9a6e6ab99 100644 > --- a/drivers/crypto/ccp/psp-dev.c > +++ b/drivers/crypto/ccp/psp-dev.c > @@ -31,7 +31,7 @@ > static DEFINE_MUTEX(sev_cmd_mutex); > static DEFINE_MUTEX(fw_init_mutex); > > -static struct sev_misc_dev *sev_misc_dev; > +static struct sev_misc_dev *misc_dev; > static int fw_init_count; > > static struct psp_device *psp_alloc_struct(struct sp_device *sp) > @@ -299,14 +299,14 @@ static int sev_ops_init(struct psp_device *psp) > * sev_do_cmd() finds the right master device to which to issue the > * command to the firmware. > */ > - if (!sev_misc_dev) { > + if (!misc_dev) { > struct miscdevice *misc; > > - sev_misc_dev = devm_kzalloc(dev, sizeof(*sev_misc_dev), GFP_KERNEL); > - if (!sev_misc_dev) > + misc_dev = devm_kzalloc(dev, sizeof(*misc_dev), GFP_KERNEL); > + if (!misc_dev) > return -ENOMEM; > > - misc = &sev_misc_dev->misc; > + misc = &misc_dev->misc; > misc->minor = MISC_DYNAMIC_MINOR; > misc->name = DEVICE_NAME; > misc->fops = &sev_fops; > @@ -315,13 +315,13 @@ static int sev_ops_init(struct psp_device *psp) > if (ret) > return ret; > > - kref_init(&sev_misc_dev->refcount); > + kref_init(&misc_dev->refcount); > } else { > - kref_get(&sev_misc_dev->refcount); > + kref_get(&misc_dev->refcount); > } > > init_waitqueue_head(&psp->sev_int_queue); > - psp->sev_misc = sev_misc_dev; > + psp->sev_misc = misc_dev; > dev_info(dev, "registered SEV device\n"); > > return 0; > @@ -340,9 +340,9 @@ static int sev_init(struct psp_device *psp) > > static void sev_exit(struct kref *ref) > { > - struct sev_misc_dev *sev_dev = container_of(ref, struct sev_misc_dev, refcount); > + struct sev_misc_dev *misc_dev = container_of(ref, struct sev_misc_dev, refcount); > > - misc_deregister(&sev_dev->misc); > + misc_deregister(&misc_dev->misc); > } > > int psp_dev_init(struct sp_device *sp) > @@ -405,7 +405,7 @@ void psp_dev_destroy(struct sp_device *sp) > struct psp_device *psp = sp->psp_data; > > if (psp->sev_misc) > - kref_put(&sev_misc_dev->refcount, sev_exit); > + kref_put(&misc_dev->refcount, sev_exit); > > sp_free_psp_irq(sp, psp); > } > diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h > index 21511419bfe6..eac850a97610 100644 > --- a/include/linux/psp-sev.h > +++ b/include/linux/psp-sev.h > @@ -525,7 +525,7 @@ int sev_platform_shutdown(int *error); > /** > * sev_platform_status - perform SEV PLATFORM_STATUS command > * > - * @init: sev_data_status structure to be processed > + * @status: sev_user_data_status structure to be processed > * @error: SEV command return code > * > * Returns: >
diff --git a/drivers/crypto/ccp/psp-dev.c b/drivers/crypto/ccp/psp-dev.c index e9966d5fc6c4..f9a9a6e6ab99 100644 --- a/drivers/crypto/ccp/psp-dev.c +++ b/drivers/crypto/ccp/psp-dev.c @@ -31,7 +31,7 @@ static DEFINE_MUTEX(sev_cmd_mutex); static DEFINE_MUTEX(fw_init_mutex); -static struct sev_misc_dev *sev_misc_dev; +static struct sev_misc_dev *misc_dev; static int fw_init_count; static struct psp_device *psp_alloc_struct(struct sp_device *sp) @@ -299,14 +299,14 @@ static int sev_ops_init(struct psp_device *psp) * sev_do_cmd() finds the right master device to which to issue the * command to the firmware. */ - if (!sev_misc_dev) { + if (!misc_dev) { struct miscdevice *misc; - sev_misc_dev = devm_kzalloc(dev, sizeof(*sev_misc_dev), GFP_KERNEL); - if (!sev_misc_dev) + misc_dev = devm_kzalloc(dev, sizeof(*misc_dev), GFP_KERNEL); + if (!misc_dev) return -ENOMEM; - misc = &sev_misc_dev->misc; + misc = &misc_dev->misc; misc->minor = MISC_DYNAMIC_MINOR; misc->name = DEVICE_NAME; misc->fops = &sev_fops; @@ -315,13 +315,13 @@ static int sev_ops_init(struct psp_device *psp) if (ret) return ret; - kref_init(&sev_misc_dev->refcount); + kref_init(&misc_dev->refcount); } else { - kref_get(&sev_misc_dev->refcount); + kref_get(&misc_dev->refcount); } init_waitqueue_head(&psp->sev_int_queue); - psp->sev_misc = sev_misc_dev; + psp->sev_misc = misc_dev; dev_info(dev, "registered SEV device\n"); return 0; @@ -340,9 +340,9 @@ static int sev_init(struct psp_device *psp) static void sev_exit(struct kref *ref) { - struct sev_misc_dev *sev_dev = container_of(ref, struct sev_misc_dev, refcount); + struct sev_misc_dev *misc_dev = container_of(ref, struct sev_misc_dev, refcount); - misc_deregister(&sev_dev->misc); + misc_deregister(&misc_dev->misc); } int psp_dev_init(struct sp_device *sp) @@ -405,7 +405,7 @@ void psp_dev_destroy(struct sp_device *sp) struct psp_device *psp = sp->psp_data; if (psp->sev_misc) - kref_put(&sev_misc_dev->refcount, sev_exit); + kref_put(&misc_dev->refcount, sev_exit); sp_free_psp_irq(sp, psp); } diff --git a/include/linux/psp-sev.h b/include/linux/psp-sev.h index 21511419bfe6..eac850a97610 100644 --- a/include/linux/psp-sev.h +++ b/include/linux/psp-sev.h @@ -525,7 +525,7 @@ int sev_platform_shutdown(int *error); /** * sev_platform_status - perform SEV PLATFORM_STATUS command * - * @init: sev_data_status structure to be processed + * @status: sev_user_data_status structure to be processed * @error: SEV command return code * * Returns: