Skip to content

L
linux
Commit 34394e45 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files
Options

ppc: fix #ifdef-s in mediabay driver (take 2) 

* Replace incorrect CONFIG_BLK_DEV_IDE #ifdef in
  check_media_bay() by CONFIG_MAC_FLOPPY one.

* Replace incorrect CONFIG_BLK_DEV_IDE #ifdef-s by
  CONFIG_BLK_DEV_IDE_PMAC ones.

* check_media_bay() is used only by drivers/block/swim3.c
  so make this function available only if CONFIG_MAC_FLOPPY
  is defined.

* check_media_bay_by_base() and media_bay_set_ide_infos()
  are used only by drivers/ide/ppc/pmac.c so so make these
  functions available only if CONFIG_MAC_FLOPPY is defined.

v2:
* Remove ifdefs from function prototypes. (Andrew Morton)

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 594765a7
Hide whitespace changes
Inline Side-by-side
Showing with 25 additions and 29 deletions
drivers/macintosh/mediabay.c
View file @ 34394e45
...@@ -78,12 +78,14 @@ struct media_bay_info { ...@@ -78,12 +78,14 @@ struct media_bay_info {
int cached_gpio; int cached_gpio;
int sleeping; int sleeping;
struct semaphore lock; struct semaphore lock;
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
void __iomem *cd_base; void __iomem *cd_base;
int cd_index;
int cd_irq; int cd_irq;
int cd_retry; int cd_retry;
#endif #endif
#if defined(CONFIG_BLK_DEV_IDE_PMAC) || defined(CONFIG_MAC_FLOPPY)
int cd_index;
#endif
}; };
#define MAX_BAYS 2 #define MAX_BAYS 2
...@@ -91,7 +93,7 @@ struct media_bay_info { ...@@ -91,7 +93,7 @@ struct media_bay_info {
static struct media_bay_info media_bays[MAX_BAYS]; static struct media_bay_info media_bays[MAX_BAYS];
int media_bay_count = 0; int media_bay_count = 0;
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
/* check the busy bit in the media-bay ide interface /* check the busy bit in the media-bay ide interface
(assumes the media-bay contains an ide device) */ (assumes the media-bay contains an ide device) */
#define MB_IDE_READY(i) ((readb(media_bays[i].cd_base + 0x70) & 0x80) == 0) #define MB_IDE_READY(i) ((readb(media_bays[i].cd_base + 0x70) & 0x80) == 0)
...@@ -401,7 +403,7 @@ static void poll_media_bay(struct media_bay_info* bay) ...@@ -401,7 +403,7 @@ static void poll_media_bay(struct media_bay_info* bay)
set_mb_power(bay, id != MB_NO); set_mb_power(bay, id != MB_NO);
bay->content_id = id; bay->content_id = id;
if (id == MB_NO) { if (id == MB_NO) {
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
bay->cd_retry = 0; bay->cd_retry = 0;
#endif #endif
printk(KERN_INFO "media bay %d is empty\n", bay->index); printk(KERN_INFO "media bay %d is empty\n", bay->index);
...@@ -414,9 +416,9 @@ static void poll_media_bay(struct media_bay_info* bay) ...@@ -414,9 +416,9 @@ static void poll_media_bay(struct media_bay_info* bay)
} }
} }
#ifdef CONFIG_MAC_FLOPPY
int check_media_bay(struct device_node *which_bay, int what) int check_media_bay(struct device_node *which_bay, int what)
{ {
#ifdef CONFIG_BLK_DEV_IDE
int i; int i;
for (i=0; i<media_bay_count; i++) for (i=0; i<media_bay_count; i++)
...@@ -426,14 +428,14 @@ int check_media_bay(struct device_node *which_bay, int what) ...@@ -426,14 +428,14 @@ int check_media_bay(struct device_node *which_bay, int what)
media_bays[i].cd_index = -1; media_bays[i].cd_index = -1;
return -EINVAL; return -EINVAL;
} }
#endif /* CONFIG_BLK_DEV_IDE */
return -ENODEV; return -ENODEV;
} }
EXPORT_SYMBOL(check_media_bay); EXPORT_SYMBOL(check_media_bay);
#endif /* CONFIG_MAC_FLOPPY */
#ifdef CONFIG_BLK_DEV_IDE_PMAC
int check_media_bay_by_base(unsigned long base, int what) int check_media_bay_by_base(unsigned long base, int what)
{ {
#ifdef CONFIG_BLK_DEV_IDE
int i; int i;
for (i=0; i<media_bay_count; i++) for (i=0; i<media_bay_count; i++)
...@@ -443,15 +445,13 @@ int check_media_bay_by_base(unsigned long base, int what) ...@@ -443,15 +445,13 @@ int check_media_bay_by_base(unsigned long base, int what)
media_bays[i].cd_index = -1; media_bays[i].cd_index = -1;
return -EINVAL; return -EINVAL;
} }
#endif
return -ENODEV; return -ENODEV;
} }
int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base,
int irq, int index) int irq, int index)
{ {
#ifdef CONFIG_BLK_DEV_IDE
int i; int i;
for (i=0; i<media_bay_count; i++) { for (i=0; i<media_bay_count; i++) {
...@@ -483,10 +483,10 @@ int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base, ...@@ -483,10 +483,10 @@ int media_bay_set_ide_infos(struct device_node* which_bay, unsigned long base,
return -ENODEV; return -ENODEV;
} }
} }
#endif /* CONFIG_BLK_DEV_IDE */
return -ENODEV; return -ENODEV;
} }
#endif /* CONFIG_BLK_DEV_IDE_PMAC */
static void media_bay_step(int i) static void media_bay_step(int i)
{ {
...@@ -521,14 +521,13 @@ static void media_bay_step(int i) ...@@ -521,14 +521,13 @@ static void media_bay_step(int i)
bay->state = mb_resetting; bay->state = mb_resetting;
MBDBG("mediabay%d: waiting reset (kind:%d)\n", i, bay->content_id); MBDBG("mediabay%d: waiting reset (kind:%d)\n", i, bay->content_id);
break; break;
case mb_resetting: case mb_resetting:
if (bay->content_id != MB_CD) { if (bay->content_id != MB_CD) {
MBDBG("mediabay%d: bay is up (kind:%d)\n", i, bay->content_id); MBDBG("mediabay%d: bay is up (kind:%d)\n", i, bay->content_id);
bay->state = mb_up; bay->state = mb_up;
break; break;
} }
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
MBDBG("mediabay%d: waiting IDE reset (kind:%d)\n", i, bay->content_id); MBDBG("mediabay%d: waiting IDE reset (kind:%d)\n", i, bay->content_id);
bay->ops->un_reset_ide(bay); bay->ops->un_reset_ide(bay);
bay->timer = msecs_to_jiffies(MB_IDE_WAIT); bay->timer = msecs_to_jiffies(MB_IDE_WAIT);
...@@ -536,16 +535,14 @@ static void media_bay_step(int i) ...@@ -536,16 +535,14 @@ static void media_bay_step(int i)
#else #else
printk(KERN_DEBUG "media-bay %d is ide (not compiled in kernel)\n", i); printk(KERN_DEBUG "media-bay %d is ide (not compiled in kernel)\n", i);
set_mb_power(bay, 0); set_mb_power(bay, 0);
#endif /* CONFIG_BLK_DEV_IDE */ #endif /* CONFIG_BLK_DEV_IDE_PMAC */
break; break;
#ifdef CONFIG_BLK_DEV_IDE_PMAC
#ifdef CONFIG_BLK_DEV_IDE
case mb_ide_resetting: case mb_ide_resetting:
bay->timer = msecs_to_jiffies(MB_IDE_TIMEOUT); bay->timer = msecs_to_jiffies(MB_IDE_TIMEOUT);
bay->state = mb_ide_waiting; bay->state = mb_ide_waiting;
MBDBG("mediabay%d: waiting IDE ready (kind:%d)\n", i, bay->content_id); MBDBG("mediabay%d: waiting IDE ready (kind:%d)\n", i, bay->content_id);
break; break;
case mb_ide_waiting: case mb_ide_waiting:
if (bay->cd_base == NULL) { if (bay->cd_base == NULL) {
bay->timer = 0; bay->timer = 0;
...@@ -587,11 +584,10 @@ static void media_bay_step(int i) ...@@ -587,11 +584,10 @@ static void media_bay_step(int i)
bay->timer = 0; bay->timer = 0;
} }
break; break;
#endif /* CONFIG_BLK_DEV_IDE */ #endif /* CONFIG_BLK_DEV_IDE_PMAC */
case mb_powering_down: case mb_powering_down:
bay->state = mb_empty; bay->state = mb_empty;
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
if (bay->cd_index >= 0) { if (bay->cd_index >= 0) {
printk(KERN_DEBUG "Unregistering mb %d ide, index:%d\n", i, printk(KERN_DEBUG "Unregistering mb %d ide, index:%d\n", i,
bay->cd_index); bay->cd_index);
...@@ -607,7 +603,7 @@ static void media_bay_step(int i) ...@@ -607,7 +603,7 @@ static void media_bay_step(int i)
bay->content_id = MB_NO; bay->content_id = MB_NO;
} }
} }
#endif /* CONFIG_BLK_DEV_IDE */ #endif /* CONFIG_BLK_DEV_IDE_PMAC */
MBDBG("mediabay%d: end of power down\n", i); MBDBG("mediabay%d: end of power down\n", i);
break; break;
} }
...@@ -739,7 +735,7 @@ static int media_bay_resume(struct macio_dev *mdev) ...@@ -739,7 +735,7 @@ static int media_bay_resume(struct macio_dev *mdev)
bay->last_value = bay->content_id; bay->last_value = bay->content_id;
bay->value_count = msecs_to_jiffies(MB_STABLE_DELAY); bay->value_count = msecs_to_jiffies(MB_STABLE_DELAY);
bay->timer = msecs_to_jiffies(MB_POWER_DELAY); bay->timer = msecs_to_jiffies(MB_POWER_DELAY);
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
bay->cd_retry = 0; bay->cd_retry = 0;
#endif #endif
do { do {
...@@ -829,7 +825,7 @@ static int __init media_bay_init(void) ...@@ -829,7 +825,7 @@ static int __init media_bay_init(void)
for (i=0; i<MAX_BAYS; i++) { for (i=0; i<MAX_BAYS; i++) {
memset((char *)&media_bays[i], 0, sizeof(struct media_bay_info)); memset((char *)&media_bays[i], 0, sizeof(struct media_bay_info));
media_bays[i].content_id = -1; media_bays[i].content_id = -1;
#ifdef CONFIG_BLK_DEV_IDE #ifdef CONFIG_BLK_DEV_IDE_PMAC
media_bays[i].cd_index = -1; media_bays[i].cd_index = -1;
#endif #endif
} }
......
include/asm-powerpc/mediabay.h
View file @ 34394e45
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
#define MB_NO 7 /* media bay contains nothing */ #define MB_NO 7 /* media bay contains nothing */
int check_media_bay(struct device_node *which_bay, int what); int check_media_bay(struct device_node *which_bay, int what);
int check_media_bay_by_base(unsigned long base, int what);
/* Number of bays in the machine or 0 */ /* Number of bays in the machine or 0 */
extern int media_bay_count; extern int media_bay_count;
/* called by pmac-ide.c to register IDE controller for media bay */ int check_media_bay_by_base(unsigned long base, int what);
extern int media_bay_set_ide_infos(struct device_node* which_bay, /* called by IDE PMAC host driver to register IDE controller for media bay */
unsigned long base, int irq, int index); int media_bay_set_ide_infos(struct device_node *which_bay, unsigned long base,
int irq, int index);
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _PPC_MEDIABAY_H */ #endif /* _PPC_MEDIABAY_H */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7