[PATCH] link dw_spi.o with the kernel objects

[PATCH] link dw_spi.o with the kernel objects

[Jean-Hugues Deschenes]

The bulk of the dw_spi driver is contained in dw_spi.c, which was statically
linked with the kernel, whether dw_spi_(pci|mmio) was requested to be built
as a module or not. This patch links dw_spi.o with the kernel module.

The kernel objects are renamed to dw_spi_(pic|mmio)_drv.ko in the process.

Signed-off-by: Jean-Hugues Deschenes <jean-hugues.deschenes-YGVykHU+fedBDgjK7y7TUQ@public.gmane.org>
---
 drivers/spi/Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
index c3e5ce7..e061b71 100644
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -16,9 +16,10 @@ obj-$(CONFIG_SPI_BFIN)			+= spi_bfin5xx.o
 obj-$(CONFIG_SPI_BITBANG)		+= spi_bitbang.o
 obj-$(CONFIG_SPI_AU1550)		+= au1550_spi.o
 obj-$(CONFIG_SPI_BUTTERFLY)		+= spi_butterfly.o
-obj-$(CONFIG_SPI_DESIGNWARE)		+= dw_spi.o
-obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci.o
-obj-$(CONFIG_SPI_DW_MMIO)		+= dw_spi_mmio.o
+obj-$(CONFIG_SPI_DW_PCI)		+= dw_spi_pci_drv.o
+dw_spi_pci_drv-objs				:= dw_spi_pci.o dw_spi.o
+obj-$(CONFIG_SPI_DW_MMIO)		+= dw_spi_mmio_drv.o
+dw_spi_mmio_drv-objs			:= dw_spi_mmio.o dw_spi.o
 obj-$(CONFIG_SPI_GPIO)			+= spi_gpio.o
 obj-$(CONFIG_SPI_IMX)			+= spi_imx.o
 obj-$(CONFIG_SPI_LM70_LLP)		+= spi_lm70llp.o


------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev

Re: [PATCH] link dw_spi.o with the kernel objects

[Grant Likely]

On Thu, Jan 21, 2010 at 8:33 AM, Jean-Hugues Deschenes
<jean-hugues.deschenes-YGVykHU+fedBDgjK7y7TUQ@public.gmane.org> wrote:
> The bulk of the dw_spi driver is contained in dw_spi.c, which was statically
> linked with the kernel, whether dw_spi_(pci|mmio) was requested to be built
> as a module or not. This patch links dw_spi.o with the kernel module.

Why not just make dw_spi a kernel module on its own?

g.

>
> The kernel objects are renamed to dw_spi_(pic|mmio)_drv.ko in the process.
>
> Signed-off-by: Jean-Hugues Deschenes <jean-hugues.deschenes-YGVykHU+fedBDgjK7y7TUQ@public.gmane.org>
> ---
>  drivers/spi/Makefile |    7 ++++---
>  1 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile
> index c3e5ce7..e061b71 100644
> --- a/drivers/spi/Makefile
> +++ b/drivers/spi/Makefile
> @@ -16,9 +16,10 @@ obj-$(CONFIG_SPI_BFIN)                       += spi_bfin5xx.o
>  obj-$(CONFIG_SPI_BITBANG)              += spi_bitbang.o
>  obj-$(CONFIG_SPI_AU1550)               += au1550_spi.o
>  obj-$(CONFIG_SPI_BUTTERFLY)            += spi_butterfly.o
> -obj-$(CONFIG_SPI_DESIGNWARE)           += dw_spi.o
> -obj-$(CONFIG_SPI_DW_PCI)               += dw_spi_pci.o
> -obj-$(CONFIG_SPI_DW_MMIO)              += dw_spi_mmio.o
> +obj-$(CONFIG_SPI_DW_PCI)               += dw_spi_pci_drv.o
> +dw_spi_pci_drv-objs                            := dw_spi_pci.o dw_spi.o
> +obj-$(CONFIG_SPI_DW_MMIO)              += dw_spi_mmio_drv.o
> +dw_spi_mmio_drv-objs                   := dw_spi_mmio.o dw_spi.o
>  obj-$(CONFIG_SPI_GPIO)                 += spi_gpio.o
>  obj-$(CONFIG_SPI_IMX)                  += spi_imx.o
>  obj-$(CONFIG_SPI_LM70_LLP)             += spi_lm70llp.o
>
>



-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev

Re: [PATCH] link dw_spi.o with the kernel objects

[Jean-Hugues Deschenes]

Grant Likely wrote:
> On Thu, Jan 21, 2010 at 8:33 AM, Jean-Hugues Deschenes
> <jean-hugues.deschenes-YGVykHU+fedBDgjK7y7TUQ@public.gmane.org> wrote:
>   
>> The bulk of the dw_spi driver is contained in dw_spi.c, which was statically
>> linked with the kernel, whether dw_spi_(pci|mmio) was requested to be built
>> as a module or not. This patch links dw_spi.o with the kernel module.
>>     
>
> Why not just make dw_spi a kernel module on its own?
>   
That would work also.

The reason I see is because dw_spi is useless on its own since it 
requires a "bus interface drver" (dw_spi_(pci|mmio) for the moment)...

jh

------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev

Re: [PATCH] link dw_spi.o with the kernel objects

[Grant Likely]

On Thu, Jan 21, 2010 at 8:50 AM, Jean-Hugues Deschenes
<jean-hugues.deschenes-YGVykHU+fedBDgjK7y7TUQ@public.gmane.org> wrote:
>
> Grant Likely wrote:
>>
>> On Thu, Jan 21, 2010 at 8:33 AM, Jean-Hugues Deschenes
>> <jean-hugues.deschenes-YGVykHU+fedBDgjK7y7TUQ@public.gmane.org> wrote:
>>
>>>
>>> The bulk of the dw_spi driver is contained in dw_spi.c, which was
>>> statically
>>> linked with the kernel, whether dw_spi_(pci|mmio) was requested to be
>>> built
>>> as a module or not. This patch links dw_spi.o with the kernel module.
>>>
>>
>> Why not just make dw_spi a kernel module on its own?
>>
>
> That would work also.
>
> The reason I see is because dw_spi is useless on its own since it requires a
> "bus interface drver" (dw_spi_(pci|mmio) for the moment)...

... just like all the other common code in the kernel.  :-)

Make it a module.

g.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev