linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: ide build failure
@ 2008-06-16  3:38 Stephen Rothwell
  2008-06-16  3:55 ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-06-16  3:38 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz; +Cc: linux-next, Benjamin Herrenschmidt

Hi Bart,

Today's linux-next build (powerpc ppc64_defconfig) failed like this:

drivers/ide/ppc/pmac.c: In function 'pmac_ide_cable_detect':
drivers/ide/ppc/pmac.c:926: error: implicit declaration of function 'drv_get_drvdata'
drivers/ide/ppc/pmac.c:926: warning: cast to pointer from integer of different size
drivers/ide/ppc/pmac.c: In function 'pmac_ide_init_dev':
drivers/ide/ppc/pmac.c:950: warning: cast to pointer from integer of different size
drivers/ide/ppc/pmac.c: In function 'pmac_ide_setup_device':
drivers/ide/ppc/pmac.c:1082: error: request for member 'irq' in something not a structure or union
drivers/ide/ppc/pmac.c: In function 'pmac_ide_pci_suspend':
drivers/ide/ppc/pmac.c:1321: error: 'hwif' undeclared (first use in this function)
drivers/ide/ppc/pmac.c:1321: error: (Each undeclared identifier is reported only once
drivers/ide/ppc/pmac.c:1321: error: for each function it appears in.)
drivers/ide/ppc/pmac.c:1316: warning: unused variable 'pmif'
drivers/ide/ppc/pmac.c: In function 'pmac_ide_pci_resume':
drivers/ide/ppc/pmac.c:1336: error: 'hwif' undeclared (first use in this function)
drivers/ide/ppc/pmac.c:1332: warning: unused variable 'pmif'

I applied the patch below ... (which clearly needs work)

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From e23339391c5e18a12f2c5d51ca5032df92d9d978 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 16 Jun 2008 13:35:36 +1000
Subject: [PATCH] ide pmac fixes 1

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/ide/ppc/pmac.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index 0671fb8..363bc4e 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -923,7 +923,7 @@ static int pmac_ide_do_resume(pmac_ide_hwif_t *pmif)
 static u8 pmac_ide_cable_detect(ide_hwif_t *hwif)
 {
 	pmac_ide_hwif_t *pmif =
-		(pmac_ide_hwif_t *)drv_get_drvdata(hwif->gendev.parent);
+		(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 	struct device_node *np = pmif->node;
 	const char *cable = of_get_property(np, "cable-type", NULL);
 
@@ -947,7 +947,7 @@ static void pmac_ide_init_dev(ide_drive_t *drive)
 {
 	ide_hwif_t *hwif = drive->hwif;
 	pmac_ide_hwif_t *pmif =
-		(pmac_ide_hwif_t *)drv_get_drvdata(hwif->gendev.parent);
+		(pmac_ide_hwif_t *)dev_get_drvdata(hwif->gendev.parent);
 
 	if (pmif->mediabay) {
 #ifdef CONFIG_PMAC_MEDIABAY
@@ -1076,10 +1076,10 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw)
 		msleep(jiffies_to_msecs(IDE_WAKEUP_DELAY));
 	}
 
-	printk(KERN_INFO DRV_NAME ": Found Apple %s controller (%s), "
-			 "bus ID %d%s, irq %d\n", model_name[pmif->kind],
-			 pmif->mdev ? "MacIO" : "PCI", pmif->aapl_bus_id,
-			 pmif->mediabay ? " (mediabay)" : "", hw.irq);
+//	printk(KERN_INFO DRV_NAME ": Found Apple %s controller (%s), "
+//			 "bus ID %d%s, irq %d\n", model_name[pmif->kind],
+//			 pmif->mdev ? "MacIO" : "PCI", pmif->aapl_bus_id,
+//			 pmif->mediabay ? " (mediabay)" : "", hw.irq);
 
 	hwif = ide_find_port_slot(&d);
 	if (hwif == NULL)
@@ -1318,7 +1318,7 @@ pmac_ide_pci_suspend(struct pci_dev *pdev, pm_message_t mesg)
 
 	if (mesg.event != pdev->dev.power.power_state.event
 			&& (mesg.event & PM_EVENT_SLEEP)) {
-		rc = pmac_ide_do_suspend(hwif);
+		rc = pmac_ide_do_suspend(pmif);
 		if (rc == 0)
 			pdev->dev.power.power_state = mesg;
 	}
@@ -1333,7 +1333,7 @@ pmac_ide_pci_resume(struct pci_dev *pdev)
 	int rc = 0;
 
 	if (pdev->dev.power.power_state.event != PM_EVENT_ON) {
-		rc = pmac_ide_do_resume(hwif);
+		rc = pmac_ide_do_resume(pmif);
 		if (rc == 0)
 			pdev->dev.power.power_state = PMSG_ON;
 	}
-- 
1.5.5.4


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* linux-next: ide build failure
@ 2008-05-30  1:54 Stephen Rothwell
  2008-05-31 13:38 ` Bartlomiej Zolnierkiewicz
  0 siblings, 1 reply; 9+ messages in thread
From: Stephen Rothwell @ 2008-05-30  1:54 UTC (permalink / raw)
  To: Bartlomiej Zolnierkiewicz; +Cc: linux-next

Hi Bart,

Today's linux-next build (x86_64 allmodconfig) failed like this:

ERROR: "ide_timing_merge" [drivers/ide/pci/via82cxxx.ko] undefined!
ERROR: "ide_timing_compute" [drivers/ide/pci/via82cxxx.ko] undefined!
ERROR: "ide_timing_find_mode" [drivers/ide/pci/opti621.ko] undefined!
ERROR: "ide_timing_find_mode" [drivers/ide/pci/cy82c693.ko] undefined!
ERROR: "ide_timing_find_mode" [drivers/ide/pci/cmd64x.ko] undefined!
ERROR: "ide_timing_find_mode" [drivers/ide/pci/cmd640.ko] undefined!
ERROR: "ide_timing_merge" [drivers/ide/pci/amd74xx.ko] undefined!
ERROR: "ide_timing_compute" [drivers/ide/pci/amd74xx.ko] undefined!
ERROR: "ide_timing_find_mode" [drivers/ide/pci/alim15x3.ko] undefined!

Caused by commit 3a3147040f2bb250ca09cd5ce5b0526969d50ba6 ("ide: convert
ide-timing.h to ide-timings.c library").

I applied the following patch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

>From 0a1194cf0893e6e9ad0ecd9ade50f710c0540552 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 30 May 2008 11:52:22 +1000
Subject: [PATCH] ide: ide-timing.h fallout

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/ide/ide-timings.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/ide/ide-timings.c b/drivers/ide/ide-timings.c
index dca53b0..8a43bd9 100644
--- a/drivers/ide/ide-timings.c
+++ b/drivers/ide/ide-timings.c
@@ -24,6 +24,7 @@
 #include <linux/kernel.h>
 #include <linux/hdreg.h>
 #include <linux/ide.h>
+#include <linux/module.h>
 
 /*
  * PIO 0-5, MWDMA 0-2 and UDMA 0-6 timings (in nanoseconds).
@@ -73,6 +74,7 @@ struct ide_timing *ide_timing_find_mode(u8 speed)
 			return NULL;
 	return t;
 }
+EXPORT_SYMBOL(ide_timing_find_mode);
 
 u16 ide_pio_cycle_time(ide_drive_t *drive, u8 pio)
 {
@@ -131,6 +133,7 @@ void ide_timing_merge(struct ide_timing *a, struct ide_timing *b,
 	if (what & IDE_TIMING_UDMA)
 		m->udma    = max(a->udma,    b->udma);
 }
+EXPORT_SYMBOL(ide_timing_merge);
 
 int ide_timing_compute(ide_drive_t *drive, u8 speed,
 		       struct ide_timing *t, int T, int UT)
@@ -199,3 +202,4 @@ int ide_timing_compute(ide_drive_t *drive, u8 speed,
 
 	return 0;
 }
+EXPORT_SYMBOL(ide_timing_compute);
-- 
1.5.5.2


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2008-06-17  9:52 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-16  3:38 linux-next: ide build failure Stephen Rothwell
2008-06-16  3:55 ` Benjamin Herrenschmidt
2008-06-16  9:54   ` Bartlomiej Zolnierkiewicz
2008-06-16 19:24     ` Bartlomiej Zolnierkiewicz
2008-06-16 22:40     ` Benjamin Herrenschmidt
2008-06-17  9:53       ` Bartlomiej Zolnierkiewicz
  -- strict thread matches above, loose matches on Subject: below --
2008-05-30  1:54 Stephen Rothwell
2008-05-31 13:38 ` Bartlomiej Zolnierkiewicz
2008-06-01  2:05   ` Stephen Rothwell

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).