From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Tue, 27 Dec 2011 15:39:23 -0600 Subject: [PATCH] ARM/of: allow *machine_desc.dt_compat to be const In-Reply-To: <1324418205-30355-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1324418205-30355-1-git-send-email-u.kleine-koenig@pengutronix.de> Message-ID: <4EFA3B0B.8020808@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 12/20/2011 03:56 PM, Uwe Kleine-K?nig wrote: > This allows dt_compat to point to a constant list of compatible strings. > > Signed-off-by: Uwe Kleine-K?nig > --- > Hello, > > does this need to be split into an of and an ARM part? No, I don't think so. I've applied it. Thanks, Rob > > Best regards > Uwe > > arch/arm/include/asm/mach/arch.h | 2 +- > drivers/of/fdt.c | 4 ++-- > include/linux/of_fdt.h | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h > index 2b0efc3..02a718a 100644 > --- a/arch/arm/include/asm/mach/arch.h > +++ b/arch/arm/include/asm/mach/arch.h > @@ -19,7 +19,7 @@ struct machine_desc { > unsigned int nr; /* architecture number */ > const char *name; /* architecture name */ > unsigned long atag_offset; /* tagged list (relative) */ > - const char **dt_compat; /* array of device tree > + const char *const *dt_compat; /* array of device tree > * 'compatible' strings */ > > unsigned int nr_irqs; /* number of IRQs */ > diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c > index fd85fa2..7dc8e6d 100644 > --- a/drivers/of/fdt.c > +++ b/drivers/of/fdt.c > @@ -107,7 +107,7 @@ int of_fdt_is_compatible(struct boot_param_header *blob, > * of_fdt_match - Return true if node matches a list of compatible values > */ > int of_fdt_match(struct boot_param_header *blob, unsigned long node, > - const char **compat) > + const char *const *compat) > { > unsigned int tmp, score = 0; > > @@ -541,7 +541,7 @@ int __init of_flat_dt_is_compatible(unsigned long node, const char *compat) > /** > * of_flat_dt_match - Return true if node matches a list of compatible values > */ > -int __init of_flat_dt_match(unsigned long node, const char **compat) > +int __init of_flat_dt_match(unsigned long node, const char *const *compat) > { > return of_fdt_match(initial_boot_params, node, compat); > } > diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h > index c84d900..ed136ad 100644 > --- a/include/linux/of_fdt.h > +++ b/include/linux/of_fdt.h > @@ -71,7 +71,7 @@ extern int of_fdt_is_compatible(struct boot_param_header *blob, > unsigned long node, > const char *compat); > extern int of_fdt_match(struct boot_param_header *blob, unsigned long node, > - const char **compat); > + const char *const *compat); > extern void of_fdt_unflatten_tree(unsigned long *blob, > struct device_node **mynodes); > > @@ -88,7 +88,7 @@ extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname, > extern void *of_get_flat_dt_prop(unsigned long node, const char *name, > unsigned long *size); > extern int of_flat_dt_is_compatible(unsigned long node, const char *name); > -extern int of_flat_dt_match(unsigned long node, const char **matches); > +extern int of_flat_dt_match(unsigned long node, const char *const *matches); > extern unsigned long of_get_flat_dt_root(void); > > extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, From mboxrd@z Thu Jan 1 00:00:00 1970 From: Rob Herring Subject: Re: [PATCH] ARM/of: allow *machine_desc.dt_compat to be const Date: Tue, 27 Dec 2011 15:39:23 -0600 Message-ID: <4EFA3B0B.8020808@gmail.com> References: <1324418205-30355-1-git-send-email-u.kleine-koenig@pengutronix.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1324418205-30355-1-git-send-email-u.kleine-koenig-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org Sender: devicetree-discuss-bounces+gldd-devicetree-discuss=m.gmane.org-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org To: =?UTF-8?B?VXdlIEtsZWluZS1Lw7ZuaWc=?= Cc: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org List-Id: devicetree@vger.kernel.org T24gMTIvMjAvMjAxMSAwMzo1NiBQTSwgVXdlIEtsZWluZS1Lw7ZuaWcgd3JvdGU6Cj4gVGhpcyBh bGxvd3MgZHRfY29tcGF0IHRvIHBvaW50IHRvIGEgY29uc3RhbnQgbGlzdCBvZiBjb21wYXRpYmxl IHN0cmluZ3MuCj4gCj4gU2lnbmVkLW9mZi1ieTogVXdlIEtsZWluZS1Lw7ZuaWcgPHUua2xlaW5l LWtvZW5pZ0BwZW5ndXRyb25peC5kZT4KPiAtLS0KPiBIZWxsbywKPiAKPiBkb2VzIHRoaXMgbmVl ZCB0byBiZSBzcGxpdCBpbnRvIGFuIG9mIGFuZCBhbiBBUk0gcGFydD8KCk5vLCBJIGRvbid0IHRo aW5rIHNvLiBJJ3ZlIGFwcGxpZWQgaXQuCgpUaGFua3MsClJvYgoKPiAKPiBCZXN0IHJlZ2FyZHMK PiBVd2UKPiAKPiAgYXJjaC9hcm0vaW5jbHVkZS9hc20vbWFjaC9hcmNoLmggfCAgICAyICstCj4g IGRyaXZlcnMvb2YvZmR0LmMgICAgICAgICAgICAgICAgIHwgICAgNCArKy0tCj4gIGluY2x1ZGUv bGludXgvb2ZfZmR0LmggICAgICAgICAgIHwgICAgNCArKy0tCj4gIDMgZmlsZXMgY2hhbmdlZCwg NSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygtKQo+IAo+IGRpZmYgLS1naXQgYS9hcmNoL2Fy bS9pbmNsdWRlL2FzbS9tYWNoL2FyY2guaCBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL21hY2gvYXJj aC5oCj4gaW5kZXggMmIwZWZjMy4uMDJhNzE4YSAxMDA2NDQKPiAtLS0gYS9hcmNoL2FybS9pbmNs dWRlL2FzbS9tYWNoL2FyY2guaAo+ICsrKyBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL21hY2gvYXJj aC5oCj4gQEAgLTE5LDcgKzE5LDcgQEAgc3RydWN0IG1hY2hpbmVfZGVzYyB7Cj4gIAl1bnNpZ25l ZCBpbnQJCW5yOwkJLyogYXJjaGl0ZWN0dXJlIG51bWJlcgkqLwo+ICAJY29uc3QgY2hhcgkJKm5h bWU7CQkvKiBhcmNoaXRlY3R1cmUgbmFtZQkqLwo+ICAJdW5zaWduZWQgbG9uZwkJYXRhZ19vZmZz ZXQ7CS8qIHRhZ2dlZCBsaXN0IChyZWxhdGl2ZSkgKi8KPiAtCWNvbnN0IGNoYXIJCSoqZHRfY29t cGF0OwkvKiBhcnJheSBvZiBkZXZpY2UgdHJlZQo+ICsJY29uc3QgY2hhciAqY29uc3QgCSpkdF9j b21wYXQ7CS8qIGFycmF5IG9mIGRldmljZSB0cmVlCj4gIAkJCQkJCSAqICdjb21wYXRpYmxlJyBz dHJpbmdzCSovCj4gIAo+ICAJdW5zaWduZWQgaW50CQlucl9pcnFzOwkvKiBudW1iZXIgb2YgSVJR cyAqLwo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL29mL2ZkdC5jIGIvZHJpdmVycy9vZi9mZHQuYwo+ IGluZGV4IGZkODVmYTIuLjdkYzhlNmQgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9vZi9mZHQuYwo+ ICsrKyBiL2RyaXZlcnMvb2YvZmR0LmMKPiBAQCAtMTA3LDcgKzEwNyw3IEBAIGludCBvZl9mZHRf aXNfY29tcGF0aWJsZShzdHJ1Y3QgYm9vdF9wYXJhbV9oZWFkZXIgKmJsb2IsCj4gICAqIG9mX2Zk dF9tYXRjaCAtIFJldHVybiB0cnVlIGlmIG5vZGUgbWF0Y2hlcyBhIGxpc3Qgb2YgY29tcGF0aWJs ZSB2YWx1ZXMKPiAgICovCj4gIGludCBvZl9mZHRfbWF0Y2goc3RydWN0IGJvb3RfcGFyYW1faGVh ZGVyICpibG9iLCB1bnNpZ25lZCBsb25nIG5vZGUsCj4gLSAgICAgICAgICAgICAgICAgY29uc3Qg Y2hhciAqKmNvbXBhdCkKPiArICAgICAgICAgICAgICAgICBjb25zdCBjaGFyICpjb25zdCAqY29t cGF0KQo+ICB7Cj4gIAl1bnNpZ25lZCBpbnQgdG1wLCBzY29yZSA9IDA7Cj4gIAo+IEBAIC01NDEs NyArNTQxLDcgQEAgaW50IF9faW5pdCBvZl9mbGF0X2R0X2lzX2NvbXBhdGlibGUodW5zaWduZWQg bG9uZyBub2RlLCBjb25zdCBjaGFyICpjb21wYXQpCj4gIC8qKgo+ICAgKiBvZl9mbGF0X2R0X21h dGNoIC0gUmV0dXJuIHRydWUgaWYgbm9kZSBtYXRjaGVzIGEgbGlzdCBvZiBjb21wYXRpYmxlIHZh bHVlcwo+ICAgKi8KPiAtaW50IF9faW5pdCBvZl9mbGF0X2R0X21hdGNoKHVuc2lnbmVkIGxvbmcg bm9kZSwgY29uc3QgY2hhciAqKmNvbXBhdCkKPiAraW50IF9faW5pdCBvZl9mbGF0X2R0X21hdGNo KHVuc2lnbmVkIGxvbmcgbm9kZSwgY29uc3QgY2hhciAqY29uc3QgKmNvbXBhdCkKPiAgewo+ICAJ cmV0dXJuIG9mX2ZkdF9tYXRjaChpbml0aWFsX2Jvb3RfcGFyYW1zLCBub2RlLCBjb21wYXQpOwo+ ICB9Cj4gZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgvb2ZfZmR0LmggYi9pbmNsdWRlL2xpbnV4 L29mX2ZkdC5oCj4gaW5kZXggYzg0ZDkwMC4uZWQxMzZhZCAxMDA2NDQKPiAtLS0gYS9pbmNsdWRl L2xpbnV4L29mX2ZkdC5oCj4gKysrIGIvaW5jbHVkZS9saW51eC9vZl9mZHQuaAo+IEBAIC03MSw3 ICs3MSw3IEBAIGV4dGVybiBpbnQgb2ZfZmR0X2lzX2NvbXBhdGlibGUoc3RydWN0IGJvb3RfcGFy YW1faGVhZGVyICpibG9iLAo+ICAJCQkJdW5zaWduZWQgbG9uZyBub2RlLAo+ICAJCQkJY29uc3Qg Y2hhciAqY29tcGF0KTsKPiAgZXh0ZXJuIGludCBvZl9mZHRfbWF0Y2goc3RydWN0IGJvb3RfcGFy YW1faGVhZGVyICpibG9iLCB1bnNpZ25lZCBsb25nIG5vZGUsCj4gLQkJCWNvbnN0IGNoYXIgKipj b21wYXQpOwo+ICsJCQljb25zdCBjaGFyICpjb25zdCAqY29tcGF0KTsKPiAgZXh0ZXJuIHZvaWQg b2ZfZmR0X3VuZmxhdHRlbl90cmVlKHVuc2lnbmVkIGxvbmcgKmJsb2IsCj4gIAkJCSAgICAgICBz dHJ1Y3QgZGV2aWNlX25vZGUgKipteW5vZGVzKTsKPiAgCj4gQEAgLTg4LDcgKzg4LDcgQEAgZXh0 ZXJuIGludCBvZl9zY2FuX2ZsYXRfZHQoaW50ICgqaXQpKHVuc2lnbmVkIGxvbmcgbm9kZSwgY29u c3QgY2hhciAqdW5hbWUsCj4gIGV4dGVybiB2b2lkICpvZl9nZXRfZmxhdF9kdF9wcm9wKHVuc2ln bmVkIGxvbmcgbm9kZSwgY29uc3QgY2hhciAqbmFtZSwKPiAgCQkJCSB1bnNpZ25lZCBsb25nICpz aXplKTsKPiAgZXh0ZXJuIGludCBvZl9mbGF0X2R0X2lzX2NvbXBhdGlibGUodW5zaWduZWQgbG9u ZyBub2RlLCBjb25zdCBjaGFyICpuYW1lKTsKPiAtZXh0ZXJuIGludCBvZl9mbGF0X2R0X21hdGNo KHVuc2lnbmVkIGxvbmcgbm9kZSwgY29uc3QgY2hhciAqKm1hdGNoZXMpOwo+ICtleHRlcm4gaW50 IG9mX2ZsYXRfZHRfbWF0Y2godW5zaWduZWQgbG9uZyBub2RlLCBjb25zdCBjaGFyICpjb25zdCAq bWF0Y2hlcyk7Cj4gIGV4dGVybiB1bnNpZ25lZCBsb25nIG9mX2dldF9mbGF0X2R0X3Jvb3Qodm9p ZCk7Cj4gIAo+ICBleHRlcm4gaW50IGVhcmx5X2luaXRfZHRfc2Nhbl9jaG9zZW4odW5zaWduZWQg bG9uZyBub2RlLCBjb25zdCBjaGFyICp1bmFtZSwKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmRldmljZXRyZWUtZGlzY3VzcyBtYWlsaW5nIGxpc3QKZGV2 aWNldHJlZS1kaXNjdXNzQGxpc3RzLm96bGFicy5vcmcKaHR0cHM6Ly9saXN0cy5vemxhYnMub3Jn L2xpc3RpbmZvL2RldmljZXRyZWUtZGlzY3Vzcwo=