From: Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
To: David Brownell <david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
Cc: spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Subject: Re: [patch 2.6.26-rc3] spi: make spi_board_info.modalias a char array
Date: Wed, 21 May 2008 20:46:33 -0700 [thread overview]
Message-ID: <20080521204633.8234c7d7.akpm@linux-foundation.org> (raw)
In-Reply-To: <200805211704.56761.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
On Wed, 21 May 2008 17:04:56 -0700 David Brownell <david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org> wrote:
> From: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
>
> Currently, 'modalias' in the spi_device structure is a 'const char *'.
> The spi_new_device() function fills in the modalias value from a passed
> in spi_board_info data block. Since it is a pointer copy, the new
> spi_device remains dependent on the spi_board_info structure after the
> new spi_device is registered (no other fields in spi_device directly
> depend on the spi_board_info structure; all of the other data is copied).
>
> This causes a problem when dynamically propulating the list of attached
> SPI devices. For example, in arch/powerpc, the list of SPI devices can
> be populated from data in the device tree. With the current code, the
> device tree adapter must kmalloc() a new spi_board_info structure for
> each new SPI device it finds in the device tree, and there is no simple
> mechanism in place for keeping track of these allocations.
>
> This patch changes modalias from a 'const char *' to a fixed char array.
> By copying the modalias string instead of referencing it, the dependency
> on the spi_board_info structure is eliminated and an outside caller does
> not need to maintain a separate spi_board_info allocation for each device.
>
> If searched through the code to the best of my ability for any references
> to modalias which may be affected by this change and haven't found anything.
> It has been tested with the lite5200b platform in arch/powerpc.
>
Not for 2.6.26, I assume?
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@ -229,7 +229,7 @@ struct spi_device *spi_new_device(struct spi_master *master,
> proxy->max_speed_hz = chip->max_speed_hz;
> proxy->mode = chip->mode;
> proxy->irq = chip->irq;
> - proxy->modalias = chip->modalias;
> + strncpy(proxy->modalias, chip->modalias, KOBJ_NAME_LEN);
>
> snprintf(proxy->dev.bus_id, sizeof proxy->dev.bus_id,
> "%s.%u", master->dev.bus_id,
> --- a/include/linux/spi/spi.h
> +++ b/include/linux/spi/spi.h
> @@ -82,7 +82,7 @@ struct spi_device {
> int irq;
> void *controller_state;
> void *controller_data;
> - const char *modalias;
> + char modalias[KOBJ_NAME_LEN];
>
> /*
> * likely need more hooks for more protocol options affecting how
a) strncpy() doesn't null-terminate the dest if it overran. strlcpy() does.
b) Given the uncertainly over the state of existing code, perhaps we
should have an explicit check for overflows here, with a WARN_ON()?
c) I think it's better to use sizeof() in the strlcpy() rather than
duplicating the array size - it's a little more robust in the face
of future changes and it is more obviously-correct (don't need to go
elsewhere to check the size of the destination).
d) KOBJ_NAME_LEN no longer exists in linux-next. I'm not sure where
it went - Greg and Kay have been up to their usual tricks.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
next prev parent reply other threads:[~2008-05-22 3:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-22 0:04 [patch 2.6.26-rc3] spi: make spi_board_info.modalias a char array David Brownell
[not found] ` <200805211704.56761.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
2008-05-22 3:46 ` Andrew Morton [this message]
[not found] ` <20080521204633.8234c7d7.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2008-05-23 17:31 ` David Brownell
[not found] ` <200805231031.25919.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
2008-05-23 17:38 ` Grant Likely
2008-05-23 18:33 ` Andrew Morton
[not found] ` <20080523113351.8c16bd02.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2008-05-23 18:45 ` David Brownell
[not found] ` <200805231145.09786.david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org>
2008-05-23 18:45 ` Grant Likely
2008-07-17 22:33 ` Grant Likely
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080521204633.8234c7d7.akpm@linux-foundation.org \
--to=akpm-de/tnxtf+jlsfhdxvbkv3wd2fqjk+8+b@public.gmane.org \
--cc=david-b-yBeKhBN/0LDR7s880joybQ@public.gmane.org \
--cc=spi-devel-general-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).