Re: [PATCH 2/5] net: rfkill: add rfkill_find_type function
From: Heikki Krogerus
Date: Thu Aug 13 2015 - 08:37:59 EST
Hi,
On Thu, Aug 13, 2015 at 11:27:46AM +0200, Johannes Berg wrote:
> On Wed, 2015-08-05 at 16:39 +0300, Heikki Krogerus wrote:
> >
> > +static const char *rfkill_types[NUM_RFKILL_TYPES] = {
> > + [RFKILL_TYPE_WLAN] = "wlan",
> > + [RFKILL_TYPE_BLUETOOTH] = "bluetooth",
> > + [RFKILL_TYPE_UWB] = "ultrawideband",
> > + [RFKILL_TYPE_WIMAX] = "wimax",
> > + [RFKILL_TYPE_WWAN] = "wwan",
> > + [RFKILL_TYPE_GPS] = "gps",
> > + [RFKILL_TYPE_FM] = "fm",
> > + [RFKILL_TYPE_NFC] = "nfc",
> > +};
> > +
> > +enum rfkill_type rfkill_find_type(const char *name)
> > +{
> > + int i;
> > +
> > + BUILD_BUG_ON(NUM_RFKILL_TYPES != RFKILL_TYPE_NFC + 1);
> >
> That BUILD_BUG_ON() is now less useful - previously it pointed to the
> code that needed to change, now you're left wondering if you don't look
> up since it isn't quite that obvious from the code what this does.
>
> Something like
>
> BUILD_BUG_ON(rfkill_types[NUM_RFKILL_TYPES - 1] == NULL);
>
> would be better. As we only add here, that would be safe enough - I've
> done something similar in the past that a bit more complicated.
OK, I'll change it.
> With that and the static inline fixed (which maybe you could even
> remove) I'm fine with all these rfkill patches, but I'm not sure how to
> merge them since they affect all kinds of other trees. If desired, I
> can apply them, but an ACK from the tegra maintainer would be good :)
Andy and Mika are preparing some changes to the device property
handling. I'll wait for their proposal and prepare next version these
after that.
Thanks,
--
heikki
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/