bus: ARM CCN PMU driver updates
* Fixed missing module aliases, thus autoloading. * Use appropriate (c)allocation function for arrays of structures. * Add compatibility string (thus support) for CCN-502 variant. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJZTSzSAAoJEL9jRaJfXa5PJRoH/3+wGBgQH/TJ5tbGvLMknd5J bbxWE7lp2iBdAFSDm/qRopv10vRwQ++IyH4hg9ApmtKVio7WwznNWYhF/BlbVTu4 0t8svUP3+xf6EjmusprVvAVmi0rUmUaD7xPZVP08gg5E/FiC9iBo6p0sj7y3gVlY L/JBW92p0gpxXHXRi/Hud9Di8prJvakRYElnTIdXceOCeE+nShDcMQkij3wI+NHN XSmIgNAVWiU65FKQmnXvaouaAfOdI3bK2ilBWgexHA67YcFhQtennF6k5pqJH2TC QQ8rkHzMYQuhAQpHiA9TLalSMzsj+70UL3+0BHQvOF5KdEeAhMovPQdv+TneKp0= =hyoR -----END PGP SIGNATURE----- Merge tag 'ccn/fixes-for-4.13-v2' of git://git.linaro.org/people/pawel.moll/linux into next/fixes-non-critical Pull "bus: ARM CCN PMU driver updates" from Paweł Moll: * Fixed missing module aliases, thus autoloading. * Use appropriate (c)allocation function for arrays of structures. * Add compatibility string (thus support) for CCN-502 variant. * tag 'ccn/fixes-for-4.13-v2' of git://git.linaro.org/people/pawel.moll/linux: bus: arm-ccn: Enable stats for CCN-502 interconnect dt-bindings: arm-ccn: Add bindings info for CCN-502 compatible string bus: arm-ccn: Use devm_kcalloc() in arm_ccn_probe() bus: arm-ccn: Fix module autoload
This commit is contained in:
commit
0281bafa39
|
@ -3,6 +3,7 @@
|
|||
Required properties:
|
||||
|
||||
- compatible: (standard compatible string) should be one of:
|
||||
"arm,ccn-502"
|
||||
"arm,ccn-504"
|
||||
"arm,ccn-508"
|
||||
|
||||
|
|
|
@ -1520,10 +1520,10 @@ static int arm_ccn_probe(struct platform_device *pdev)
|
|||
if (err)
|
||||
return err;
|
||||
|
||||
ccn->node = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_nodes,
|
||||
GFP_KERNEL);
|
||||
ccn->xp = devm_kzalloc(ccn->dev, sizeof(*ccn->node) * ccn->num_xps,
|
||||
GFP_KERNEL);
|
||||
ccn->node = devm_kcalloc(ccn->dev, ccn->num_nodes, sizeof(*ccn->node),
|
||||
GFP_KERNEL);
|
||||
ccn->xp = devm_kcalloc(ccn->dev, ccn->num_xps, sizeof(*ccn->node),
|
||||
GFP_KERNEL);
|
||||
if (!ccn->node || !ccn->xp)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -1544,9 +1544,11 @@ static int arm_ccn_remove(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
static const struct of_device_id arm_ccn_match[] = {
|
||||
{ .compatible = "arm,ccn-502", },
|
||||
{ .compatible = "arm,ccn-504", },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, arm_ccn_match);
|
||||
|
||||
static struct platform_driver arm_ccn_driver = {
|
||||
.driver = {
|
||||
|
|
Loading…
Reference in a new issue